Resolve the CHANGELOG.md conflict by keeping both new entries: this branch's group_by/stats entry above main's GBFS v3 station-name entry. Co-Authored-By: Claude Opus 5.5 <[email protected]>