Docs-only conflict in BUG_HISTORY: BUG-1311 (#52) and BUG-1312..1315 (#53) both appended after BUG-1310; kept both in number order. Product owner chose option A on #53: Claude merges a stale branch when only docs conflict. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LutgzyJqNhPpZy1nFsJtN3