Remove merge conflict artifacts