diff --git a/Core_DOM/Core_SC_DOM/ROOT b/Core_DOM/Core_SC_DOM/ROOT
index bb2a844..af84522 100644
--- a/Core_DOM/Core_SC_DOM/ROOT
+++ b/Core_DOM/Core_SC_DOM/ROOT
@@ -9,15 +9,9 @@ session "Core_SC_DOM" (AFP) = "HOL-Library" +
     "common/pointers"
     "common/preliminaries"
     "common/tests"
-<<<<<<< HEAD
-    "safely_composable"
-    "safely_composable/classes"
-    "safely_composable/pointers"
-=======
     "safely_composable" 
     "safely_composable/classes" 
-    "safely_composable/pointers" 
->>>>>>> 64ac3d3786e34b59b9609fed7a4f1c7c88b6756e
+    "safely_composable/pointers"
   theories
     Core_DOM
     Core_DOM_Tests