Add a CHANGELOG entry before merging