checking conflict
cleaning the merge marks.