CHANGELOG/ChangeLog conflict