Gitconfig update
Merged changes