added .gitconfig
merge