fixed merge detritus in ChangeLog