ChangeLog: Fix a merge bug.