added alias for git merge