clean up cvs merge conflict flags.