fixed git merge text