feedback1 integrate: WG 奥术 shown 本局禁用 where the mode disables it; returned equipment auto-merges

# Conflicts:
#	public/js/ui/shopBar.js

server/match/effectsMeta.js

@@ -527,6 +527,7 @@ export function makeCtx(m, ps, source, hook, ev = null) {
         for (const it of l.piece.items || []) ps.stow(it, { allowTemp: true });
         l.piece.items = [];
         ps.returnCopies(l.piece);
+        ps.checkItemMerges(); // the returned equipment auto-merges like any gain
       }
       ps.recompute();
       return true;