diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index 823926f1..fd97dffc 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -530,11 +530,7 @@
 			GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
 			;Var Timeout = 0
 		EndIf
-<<<<<<< HEAD
 		If Seeker = "curr" Then
-=======
-		If PauseOrder = "false" Then
->>>>>>> 0479282586527f47f0f2821824b32af59e613c53
 			Open "ROOT/taobin_project/xml/page_catalog.xml"  
 		Else
 			Open "ROOT/taobin_project/xml/page_brewing3.xml"