Get rid of merge conflict markers