added git merge aliases