Get rid of merge conflict artifacts