cleanup merge conflict text