Remove merge conflict tag.