Add a CHANGELOG entry before merging the branch