diff --git a/website/docs/api/spancategorizer.mdx b/website/docs/api/spancategorizer.mdx
index c1951e699..c6481dd85 100644
--- a/website/docs/api/spancategorizer.mdx
+++ b/website/docs/api/spancategorizer.mdx
@@ -23,12 +23,7 @@ the entities as a multi-class problem.
 Predicted spans will be saved in a [`SpanGroup`](/api/spangroup) on the doc.
 Individual span scores can be found in `spangroup.attrs["scores"]`.
 
-<<<<<<< HEAD:website/docs/api/spancategorizer.md
-
-## Assigned Attributes {#assigned-attributes}
-=======
 ## Assigned Attributes {id="assigned-attributes"}
->>>>>>> master:website/docs/api/spancategorizer.mdx
 
 Predictions will be saved to `Doc.spans[spans_key]` as a
 [`SpanGroup`](/api/spangroup). The scores for the spans in the `SpanGroup` will
@@ -99,15 +94,7 @@ architectures and their arguments and hyperparameters.
 %%GITHUB_SPACY/spacy/pipeline/spancat.py
 ```
 
-<<<<<<< HEAD:website/docs/api/spancategorizer.md
-```python
-%%GITHUB_SPACY/spacy/pipeline/spancat_exclusive.py
-```
-
-## SpanCategorizer.\_\_init\_\_ {#init tag="method"}
-=======
 ## SpanCategorizer.\_\_init\_\_ {id="init",tag="method"}
->>>>>>> master:website/docs/api/spancategorizer.mdx
 
 > #### Example
 >