Conflicts in CHANGELOG.md, docs/BUG_HISTORY.md and the pre-work ledger were both sides appending at the same place; both kept. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DbBXoyeZrYn6ryNcSe5Y2Y