diff --git a/shared/resource/jsons/dic_zyz_shop.json b/shared/resource/jsons/dic_zyz_shop.json
index b3757a272..3ae7ae0c4 100644
--- a/shared/resource/jsons/dic_zyz_shop.json
+++ b/shared/resource/jsons/dic_zyz_shop.json
@@ -541,13 +541,8 @@
     },
     {
         "id": 5004,
-<<<<<<< Updated upstream
-        "goodid": 41156,
-        "goodname": "女初成[貂蝉]",
-=======
         "goodid": 41140,
         "goodname": "曲误周顾*小乔",
->>>>>>> Stashed changes
         "shop": 5,
         "type": 7,
         "guildlvlimit": "&",
@@ -1195,8 +1190,6 @@
         "goodname": "地玉·命（一品）",
         "shop": 8,
         "type": 2,
-<<<<<<< Updated upstream
-=======
         "guildlvlimit": "&",
         "lvlimit": 0,
         "purchaselimit": 9999,
@@ -1272,13 +1265,12 @@
         "goodname": "息壤",
         "shop": 6,
         "type": 5,
->>>>>>> Stashed changes
         "guildlvlimit": "&",
         "lvlimit": 0,
         "purchaselimit": 9999,
         "refreshType": 1,
-        "money": 40011,
-        "price": 20,
+        "money": 40002,
+        "price": 200,
         "chosen": 0,
         "indirectId": 0
     }