diff --git a/cnorxz/base/base.pyx b/cnorxz/base/base.pyx
index 76c44f9..9e7a4ab 100644
--- a/cnorxz/base/base.pyx
+++ b/cnorxz/base/base.pyx
@@ -212,4 +212,3 @@ cdef class AIndex_Double (Index):
     
     def get(self):
         return self.cpp_index.get().A_get()
->>>>>>> 75d3cab2b6bc00bbde0d9a33ebc5c89d77333f34