gitconfig changes
merge