diff --git a/UI/MainUI/Version b/UI/MainUI/Version
index 458cc5adb..4010e5dd4 100644
--- a/UI/MainUI/Version
+++ b/UI/MainUI/Version
@@ -1,13 +1,3 @@
 # Version file
 
-<<<<<<< variant A
 SUBMINOR_VERSION:=1
-
-# v0.9.1 requires Main v0.9.59
->>>>>>> variant B
-SUBMINOR_VERSION:=1
-####### Ancestor
-SUBMINOR_VERSION:=0
-
-# v0.9.1 requires Main v0.9.59
-======= end