cleared merge conflict text.