chore: document merge-to-main conflict reconciliation in CHANGELOG

[mdheller]

Motivation

• Document that long-lived branch drift across documentation, API contracts, examples, and schema artifacts was reconciled to unblock merging to main without making contract-level semantic changes.

Description

• Add a short Unreleased entry to CHANGELOG.md noting the reconciliation and commit the update to branch work (modified file: CHANGELOG.md).

Testing

• Ran git diff -- CHANGELOG.md to verify the insertion and git status --short --branch to confirm the commit state, and both commands succeeded.

---

Codex Task