Perhaps we can think of a different way of adding entries to the CHANGELOG.md, as this is most commonly the merge conflict ... maybe we don't add it directly, but place it "somewhere" from where it's then pushed to the CHANGELOG.md in the correct place when (squash) merging 🤔 ... something for us to think about.
Originally posted by @Flash0ver in #4724 (comment)