diff --git a/shared/resource/jsons/dic_zyz_shopList.json b/shared/resource/jsons/dic_zyz_shopList.json
index 339497995..a97476996 100644
--- a/shared/resource/jsons/dic_zyz_shopList.json
+++ b/shared/resource/jsons/dic_zyz_shopList.json
@@ -37,11 +37,7 @@
         "shopicon": "shoptubiaozi_shizhuang",
         "typeid": "7&12",
         "moneyid": "40006&40014",
-<<<<<<< Updated upstream
-        "openLimit": "20&"
-=======
         "openLimit": "5&"
->>>>>>> Stashed changes
     },
     {
         "shopid": 6,