Remove conflict markers