fixed git merge comments