diff --git a/multi_user/operators.py b/multi_user/operators.py
index e86e1a9..2e25f69 100644
--- a/multi_user/operators.py
+++ b/multi_user/operators.py
@@ -393,10 +393,7 @@ def register():
     for cls in classes:
         register_class(cls)
 
-<<<<<<< HEAD
-=======
     bpy.app.handlers.load_pre.append(load_pre_handler)
->>>>>>> master
 
 def unregister():
     global client