diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py b/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py
index 7e65156c0c..8fe718ca83 100644
--- a/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py
+++ b/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py
@@ -56,8 +56,4 @@ def getMetaData() -> Dict[str, Any]:
 
 
 def register(app: "Application") -> Dict[str, Any]:
-<<<<<<< HEAD
-    return {"version_upgrade": upgrade}
-=======
     return { "version_upgrade": upgrade }
->>>>>>> master