Remove trailing ^M that prevent CVS-merging.