Added git merge alias