Conflicts resolved keeping both sides: - bandDraft.js header: the 本局禁用 mark of a strategy tied to a switched-off bond, then the 本局信息 dialog; the code merged cleanly (the card's 本局禁用 tag and the detail note sit beside the dialog's state and button). - draft.css: the 本局禁用 tag / note rules, then the 本局信息 entry and dialog block (its header cites DESIGN §21.28). - CHANGELOG 0.1.1 界面: the gaps and issue #5 / #8 lines, then the dialog line. - PLAYING §6: the disabled-bond line says where to look again (draft dialog, in-game 🔍); the 变形同构体 line keeps its pairing explanation. - DESIGN: the branch's "§21.26 Match info in the strategy draft" becomes §21.28; its two §10 references follow.