Two conflicts: docs/MAP.md (our map plus upstream's cfg_categories/wow_ini modules and WOW_CHAR row) and the Update ambiguity ceiling in game_plugins.rs (kept ours, re-measured in a follow-up commit). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>