diff --git a/buyer/public/config.js b/buyer/public/config.js
index 06ab461d..acbea889 100644
--- a/buyer/public/config.js
+++ b/buyer/public/config.js
@@ -3,19 +3,10 @@ var BASE = {
      * @description api请求基础路径
      */
     API_DEV: {
-<<<<<<< HEAD
-      // common: "https://common-api.pickmall.cn",
-      // buyer: "https://buyer-api.pickmall.cn",
-      // seller: "https://store-api.pickmall.cn",
-      // manager: "https://admin-api.pickmall.cn"
-      common: "http://127.0.0.1:8890",
-      buyer: "http://127.0.0.1:8892",
-=======
       common: "http://localhost:8890",
       buyer: "http://localhost:8888",
       seller: "http://localhost:8889",
       manager: "http://localhost:8887"
->>>>>>> clerk
     },
     API_PROD: {
       common: "http://192.168.2.110:8890",
diff --git a/seller/public/config.js b/seller/public/config.js
index 7df44739..73d787b0 100644
--- a/seller/public/config.js
+++ b/seller/public/config.js
@@ -3,19 +3,10 @@ var BASE = {
    * @description api请求基础路径
    */
   API_DEV: {
-<<<<<<< HEAD
-    // common: "https://common-api.pickmall.cn",
-    // buyer: "https://buyer-api.pickmall.cn",
-    // seller: "https://store-api.pickmall.cn",
-    // manager: "https://admin-api.pickmall.cn"
-    common: "http://127.0.0.1:8890",
-    seller: "http://127.0.0.1:8889",
-=======
     common: "http://localhost:8890",
     buyer: "http://localhost:8888",
     seller: "http://localhost:8889",
     manager: "http://localhost:8887"
->>>>>>> clerk
   },
   API_PROD: {
     common: "https://common-api.pickmall.cn",