remove merge conflict text