diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config
index f39f212..bef4961 100755
--- a/LogicServer/data/config/Merge/ItemMerge.config
+++ b/LogicServer/data/config/Merge/ItemMerge.config
@@ -2074,8 +2074,8 @@ ItemMergeConfig = {
 				second_index = 2,
 				openserverday = 1,
 				table = { { id = 845, type = 0, count = 10000 }, { id = 4, type = 4, count = 1000000 } },
-				mergelimit = { office = 23, circle = 15 },
-				limitTips = "转生等级15且官职为5珠亲王以上方可兑换",
+				mergelimit = { office = 23, zs = 15 },
+				limitTips = "转生15且5珠亲王以上方可兑换",
 			},
 			[11001] = {
 				circle = 0,
diff --git a/LogicServer/data/config/shop/shop.config b/LogicServer/data/config/shop/shop.config
index 4fb4264..f7e0468 100755
--- a/LogicServer/data/config/shop/shop.config
+++ b/LogicServer/data/config/shop/shop.config
@@ -117,12 +117,12 @@ ShopConfig = {
 				shopid = 94,
 				shoptype = 1,
 				Tabshop = 1,
-				shop = { id = 1242, type = 0, count = 1 },
+				shop = { id = 1394, type = 0, count = 1 },
 				statictype = 51,
-				buytype = { { limit = { { value = 0, times = 1 } }, type = 3 } },
+				buytype = { { limit = { { value = 15, times = 1 } }, type = 2 } },
 				daylimit = 0,
 				levellimit = 1,
-				price = { id = 3, type = 3, count = 188 },
+				price = { id = 4, type = 4, count = 1000000 },
 			},
 		},
 		[2] = {