diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 880d2413..09b53694 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -94,11 +94,8 @@
 	Var RandomPromotionTOT = 0
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
-<<<<<<< HEAD
-	Var XMLPageVersion = "5.53"
-=======
+
 	Var XMLPageVersion = "5.54"
->>>>>>> 6ea34f3348c4462d718381a6f0500e36f9b5d8c4
 
 </EventOpen>