Remove merge conflict text.