diff --git a/src/ontology/aio-odk.yaml b/src/ontology/aio-odk.yaml
index ebe9989..d7b18fd 100644
--- a/src/ontology/aio-odk.yaml
+++ b/src/ontology/aio-odk.yaml
@@ -5,7 +5,6 @@ repo: artificial-intelligence-ontology
 use_mappings: true
 import_group:
   products:
-<<<<<<< HEAD
     - id: swo
 sssom_mappingset_group:
   products:
@@ -13,8 +12,6 @@ sssom_mappingset_group:
       maintenance: manual
 namespaces:
   - https://w3id.org/aio/
-=======
->>>>>>> origin/main
 report_fail_on: none
 release_artefacts:
   - base