Constant merge conflicts with CHANGES.md

@egor-rogov @allejo Do you know how other projects [with a changelog] solve this? This is starting to drive me nuts. Because ever contribution changes this file and is basing their work on master (like they should) this means ever single time I merge any PR I have to do thru this ridiculous merge conflict dance with the changelog.

It's not hard per-se, it's just annoying, and then all the CI runs again (for no reason), etc..