Update git.md

Added merge conflict resolution
gh-4