Update CHANGELOG with merge commits