Merged gitconfig from macbook