avoid merge conflicts in ChangeLog