Add another git merge alias