Conflicts were only in the Change notes of docs/file-format-parity.md and docs/target-app-parity.md: main's notes kept, the `.sketch` note added. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>