added aliases to git config as well as merge+diff tools