Merging in work gitconfig