adding an alias for git merge.