merged gitconfig with laptop copy