fix changelog merging

Merging changelogs actually works now and seems to handle conflicts quite well.