diff --git a/inter/uae_dubai/video/script_video.ev b/inter/uae_dubai/video/script_video.ev
index f3e6ae50..8821c449 100644
--- a/inter/uae_dubai/video/script_video.ev
+++ b/inter/uae_dubai/video/script_video.ev
@@ -3,11 +3,10 @@ Var EventTurnOn = 0
 
 
 
-<<<<<<< HEAD
 DEBUGVAR EventTurnOn
 
 Var VideoMainPage = "ROOT/taobin_project/inter/common/video/video_main.mp4"
-=======
+
 DEBUGVAR MainfileSize
 If SystemDateMonthInt = 12 Then
     GetFileSizeK "taobin_project/inter/common/video/video_main_event.mp4" MainfileSize
@@ -40,4 +39,3 @@ Else
     Var ShowButtonClickFull = "Invisible"
     Var VideoMainPage = "ROOT/taobin_project/inter/common/video/video_main.mp4"
 EndIf
->>>>>>> a57ecc08db5486e3f26fe455f2d0e34aa480dd30
diff --git a/xml/page_catalog_group_pro_robinson_beauty.skt b/xml/page_catalog_group_pro_robinson_beauty.skt
index 69c5f5dd..003e1541 100644
--- a/xml/page_catalog_group_pro_robinson_beauty.skt
+++ b/xml/page_catalog_group_pro_robinson_beauty.skt
@@ -14,10 +14,7 @@
 
 
     Var Timeout = 0
-<<<<<<< HEAD
-=======
     Var FromRobinsonBeautyPro = 0
->>>>>>> d60c9e3869794302ccb03e1d7b65f6e600a7b226
 
 
     ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
diff --git a/xml/page_catalog_group_pro_robinson_beauty.xml b/xml/page_catalog_group_pro_robinson_beauty.xml
index fa072e59..7f2eb751 100644
--- a/xml/page_catalog_group_pro_robinson_beauty.xml
+++ b/xml/page_catalog_group_pro_robinson_beauty.xml
@@ -12,10 +12,7 @@
 
 
     Var Timeout = 0
-<<<<<<< HEAD
-=======
     Var FromRobinsonBeautyPro = 0
->>>>>>> d60c9e3869794302ccb03e1d7b65f6e600a7b226
 
 
     ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"