I created a small script for solving conflicts in changelogs:

https://gitlab.com/salekpawel/cf_changelog

I believe that changelog should not be created from commits, because commit comments are targeted rather for other developers.

Git union will not work when you would like to group changelog entries (like new features, bugfixes, etc.) from multiple sources. This is not a simple union.

That's why I created my own tool.