diff --git a/platformapi/jdshopapi/store_test.go b/platformapi/jdshopapi/store_test.go
index 11402013..9f592c6b 100644
--- a/platformapi/jdshopapi/store_test.go
+++ b/platformapi/jdshopapi/store_test.go
@@ -55,11 +55,7 @@ func TestGetCity(t *testing.T) {
 }
 
 func TestGetCounty(t *testing.T) {
-<<<<<<< HEAD
 	result, err := api.GetCounty(2815)
-=======
-	result, err := api.GetCounty(2823)
->>>>>>> 6b4ee9a49b7be7d021c71cd098aeef6c9e75e5c2
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/platformapi/mtpsapi/shop_page.go b/platformapi/mtpsapi/shop_page.go
index 7a766be8..b7711197 100644
--- a/platformapi/mtpsapi/shop_page.go
+++ b/platformapi/mtpsapi/shop_page.go
@@ -1,15 +1,6 @@
 package mtpsapi
 
 import (
-<<<<<<< HEAD
-=======
-	"fmt"
-	"net/http"
-	"strings"
-
-	"git.rosy.net.cn/baseapi"
-	"git.rosy.net.cn/baseapi/platformapi"
->>>>>>> 6b4ee9a49b7be7d021c71cd098aeef6c9e75e5c2
 	"git.rosy.net.cn/baseapi/utils"
 )
 
@@ -52,7 +43,6 @@ func (a *API) AccessStorePage(fullURL string, bizParams map[string]interface{},
 }
 
 func (a *API) PagePoiUpdate(outerPoiID, contactName, contactPhone, contactEmail string) (err error) {
-<<<<<<< HEAD
 	// if outerPoiID == "" || contactName == "" || contactPhone == "" || contactEmail == "" {
 	// 	return fmt.Errorf("所有参数必须都要有值")
 	// }
@@ -63,21 +53,6 @@ func (a *API) PagePoiUpdate(outerPoiID, contactName, contactPhone, contactEmail
 	// 	"contactEmail": contactEmail,
 	// }
 	// _, err = a.AccessAPI2("https://page.peisong.meituan.com/api", "haikuiopen/haikui/open/partner/poi/update", params)
-=======
-	if outerPoiID == "" || contactName == "" || contactPhone == "" || contactEmail == "" {
-		return fmt.Errorf("所有参数必须都要有值")
-	}
-	params := map[string]interface{}{
-		"outerPoiId":   outerPoiID,
-		"contactName":  contactName,
-		"contactPhone": contactPhone,
-		"contactEmail": contactEmail,
-	}
-	if token, err := a.RefreshToken(); err == nil {
-		a.token = token
-	}
-	_, err = a.AccessAPI2("https://page.peisong.meituan.com/api", "haikuiopen/haikui/open/partner/poi/update", params)
->>>>>>> 6b4ee9a49b7be7d021c71cd098aeef6c9e75e5c2
 	return err
 }