gitconfig mods
merge changes