added git merge shortcuts