Remove merge conflict remnants from CHANGELOG.