diff --git a/xml/page_board.xml b/xml/page_board.xml
index 83b839e4..f5f14326 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -155,6 +155,7 @@
 
 		GenHashWithTimeStamp QRCODE99x
 		Var QRCODE99 = "https://taobin-beverage.web.app/" + QRCODE99x
+		;Var QRCODE99 = "https://uat-taobin-beverage.firebaseapp.com/" + QRCODE99x
 		WEB "ENABLE"
 		
 	Else
diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml
index 704ef271..ef986097 100644
--- a/xml/page_catalog.xml
+++ b/xml/page_catalog.xml
@@ -392,7 +392,6 @@
 </EventClick>
 </Button>
 
-<<<<<<< HEAD
 ;<QRCode>
 ;<X> 895 </X>
 ;<Y> QRCODE99_Y</Y>
@@ -401,16 +400,6 @@
 ;<State> "Enable" </State>
 ;<Service> testservice </Service>
 ;</QRCode>
-=======
-<QRCode>
-<X> 895 </X>
-<Y> QRCODE99_Y</Y>
-<Width> 178 </Width>
-<Height> 178 </Height>
-<State> WebAppShow </State>
-<Service> testservice </Service>
-</QRCode>
->>>>>>> 1a60ddb6f8d5f3277cd6ebf9fe23851855eee89c