Fix order of ChangeLog entries after merge.