merged with my prev git config
my aliases
merge