abort the correct verb when smart_merge fails
abort the correct verb when smart_merge fails

nxnfufunezn/legit,ericmjl/legit,hickford/legit,jetgeng/legit,hickford/legit,nxnfufunezn/legit,kennethreitz/legit,deshion/legit,deshion/legit,ericmjl/legit,wkentaro/legit,wkentaro/legit,kennethreitz/legit,jetgeng/legit