Conflicts: docs/gaps.md: header line is ours plus the PR's missing change item (later Last updated date); change-log rows kept both, newest first docs/file-format-parity.md: same