fixed mistaken alias for git merge :)