diff --git a/qubittool/rowmodel.py b/qubittool/rowmodel.py
index 7447ea0..7309151 100644
--- a/qubittool/rowmodel.py
+++ b/qubittool/rowmodel.py
@@ -40,7 +40,6 @@ class RowModel:
 
     def get_customerid(self):
         return self.customerid
-<<<<<<< HEAD
 
     def set_materialid(self, matrlid:str):
         self.materialid = matrlid
@@ -48,9 +47,6 @@ class RowModel:
     def get_materialid(self):
         return self.materialid
 
-=======
-    
->>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
     def set_qubitassay(self, assay:str):
         self.qubitassay = assay