diff --git a/platformapi/ebaiapi/shop_test.go b/platformapi/ebaiapi/shop_test.go
index 6f3c03de..96089050 100644
--- a/platformapi/ebaiapi/shop_test.go
+++ b/platformapi/ebaiapi/shop_test.go
@@ -53,11 +53,7 @@ func TestShopCreate(t *testing.T) {
 }
 
 func TestShopGet(t *testing.T) {
-<<<<<<< HEAD
-	result, err := api.ShopGet2("", 1101809925) //2233065879 ,22267134648
-=======
 	result, err := api.ShopGet2("", 2235877567) //2233065879 ,22267134648
->>>>>>> c32151cdb461bbd605e7336062d7f9d3d22ef127
 	if err != nil {
 		t.Fatal(err)
 	} else {