added aliases to git fetch and merge