remove git merge text remnant