Fixed conflict marks in the ChangeLog file