diff --git a/ontology/master/catalog-v001.xml b/ontology/master/catalog-v001.xml
index 24d3a07..9603773 100644
--- a/ontology/master/catalog-v001.xml
+++ b/ontology/master/catalog-v001.xml
@@ -20,12 +20,7 @@
     <uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.5.0"/>
     <uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/victim/victim.ttl" name="https://ontology.unifiedcyberontology.org/uco/victim/1.5.0"/>
     <uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.5.0"/>
-<<<<<<< HEAD
-    <uri id="User Entered Import Resolution" uri="../investigation/investigation.ttl" name="https://ontology.caseontology.org/case/investigation/1.4.0"/>
-    <uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.caseontology.org/case/vocabulary/1.4.0"/>
-=======
     <uri id="User Entered Import Resolution" uri="../investigation/investigation.ttl" name="https://ontology.caseontology.org/case/investigation/1.5.0"/>
     <uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.caseontology.org/case/vocabulary/1.5.0"/>
->>>>>>> develop
     <uri id="User Entered Import Resolution" uri="case.ttl" name="https://ontology.caseontology.org/case/case"/>
 </catalog>