ChangeLog merge=git-merge-changelog