Add git merge alias and update obmenu