Get rid of conflict markers