Update CHANGELOG for merge