Fix merge glitches in 2 ChangeLog files.