Remove CVS-merge trash from ChangeLog.