fixup git-merge-changelog package