added git merge alias