Remove CVS conflict markers from file