Adjust CHANGELOG with merge commits