Fix CHANGES after merge.