diff --git a/ontolearn/triple_store.py b/ontolearn/triple_store.py
index f2686329..5cfe30bd 100644
--- a/ontolearn/triple_store.py
+++ b/ontolearn/triple_store.py
@@ -291,11 +291,7 @@ def __repr__(self):
 
 
 class TripleStoreReasoner(AbstractOWLReasoner):
-<<<<<<< HEAD
-    #__slots__ = "ontology"
-=======
->>>>>>> origin/merge_triplestore_and_kb
-
+    
     def __init__(self, ontology: TripleStoreOntology):
         self.ontology = ontology
         self.url = self.ontology.url