Fix up merged ChangeLog entries