Remove merge conflict artifact.