sorting some space issues
merge
typo in gitconfig