updated gitconfig
fixed merge