Add a CHANGELOG entry before the merge