fix_conflict: remove unqwnated changes

Author: pidoux7

docs/concepts/torch-component.md

@@ -82,7 +82,7 @@ In EDS-NLP, sharing a subcomponent is simply done by sharing the object between
         eds.ner_crf(
             ...,
             embedding=eds.transformer(
-                model="bert-base-uncased",
+                model_name="bert-base-uncased",
                 window=128,
                 stride=96,
             ),

mkdocs.yml

@@ -120,12 +120,11 @@ nav:
 
       - Trainable components:
           - pipes/trainable/index.md
-          - 'Transformer': pipes/trainable/embeddings/transformer.md
-          - 'Text CNN': pipes/trainable/embeddings/text_cnn.md
-          - 'Span Pooler': pipes/trainable/embeddings/span_pooler.md
-          - 'NER': pipes/trainable/ner.md
-          - 'Span Classifier': pipes/trainable/span-classifier.md
-          - 'Span Linker': pipes/trainable/span-linker.md
+          - pipes/trainable/embeddings/transformer.md
+          - pipes/trainable/embeddings/text_cnn.md
+          - pipes/trainable/embeddings/span_pooler.md
+          - pipes/trainable/ner.md
+          - pipes/trainable/span-qualifier.md
   - tokenizers.md
   - Data Connectors:
       - data/index.md