Fix merge conflict in CHANGES.