Added the other set_successful_due_to_conflict call that we needed, which was what jdoliner had added but in the "wrong" place.
Added the other set_successful_due_to_conflict call that we needed, which was what jdoliner had added but in the "wrong" place.

gdi2290/rethinkdb,jmptrader/rethinkdb,captainpete/rethinkdb,spblightadv/rethinkdb,yaolinz/rethinkdb,wojons/rethinkdb,gdi2290/rethinkdb,dparnell/rethinkdb,nviennot/rethinkdb,bchavez/rethinkdb,ayumilong/rethinkdb,matthaywardwebdesign/rethinkdb,alash3al/rethinkdb,victorbriz/rethinkdb,eliangidoni/rethinkdb,sbusso/rethinkdb,catroot/rethinkdb,mbroadst/rethinkdb,mquandalle/rethinkdb,Qinusty/rethinkdb,catroot/rethinkdb,urandu/rethinkdb,gavioto/rethinkdb,Qinusty/rethinkdb,marshall007/rethinkdb,captainpete/rethinkdb,robertjpayne/rethinkdb,AtnNn/rethinkdb,robertjpayne/rethinkdb,urandu/rethinkdb,ajose01/rethinkdb,4talesa/rethinkdb,gdi2290/rethinkdb,AntouanK/rethinkdb,yaolinz/rethinkdb,pap/rethinkdb,jmptrader/rethinkdb,4talesa/rethinkdb,eliangidoni/rethinkdb,dparnell/rethinkdb,urandu/rethinkdb,JackieXie168/rethinkdb,gavioto/rethinkdb,catroot/rethinkdb,ayumilong/rethinkdb,sontek/rethinkdb,ajose01/rethinkdb,eliangidoni/rethinkdb,greyhwndz/rethinkdb,niieani/rethinkdb,4talesa/rethinkdb,grandquista/rethinkdb,KSanthanam/rethinkdb,gavioto/rethinkdb,AtnNn/rethinkdb,rrampage/rethinkdb,gdi2290/rethinkdb,sebadiaz/rethinkdb,sbusso/rethinkdb,losywee/rethinkdb,wojons/rethinkdb,jfriedly/rethinkdb,wujf/rethinkdb,KSanthanam/rethinkdb,sbusso/rethinkdb,gavioto/rethinkdb,bchavez/rethinkdb,ajose01/rethinkdb,captainpete/rethinkdb,yakovenkodenis/rethinkdb,Wilbeibi/rethinkdb,marshall007/rethinkdb,scripni/rethinkdb,sontek/rethinkdb,AtnNn/rethinkdb,elkingtonmcb/rethinkdb,tempbottle/rethinkdb,lenstr/rethinkdb,nviennot/rethinkdb,dparnell/rethinkdb,RubenKelevra/rethinkdb,sontek/rethinkdb,jesseditson/rethinkdb,spblightadv/rethinkdb,losywee/rethinkdb,mquandalle/rethinkdb,scripni/rethinkdb,niieani/rethinkdb,AntouanK/rethinkdb,bpradipt/rethinkdb,wkennington/rethinkdb,spblightadv/rethinkdb,victorbriz/rethinkdb,dparnell/rethinkdb,yakovenkodenis/rethinkdb,AtnNn/rethinkdb,mbroadst/rethinkdb,jfriedly/rethinkdb,lenstr/rethinkdb,victorbriz/rethinkdb,jfriedly/rethinkdb,AntouanK/rethinkdb,jfriedly/rethinkdb,gdi2290/rethinkdb,sebadiaz/rethinkdb,gavioto/rethinkdb,bchavez/rethinkdb,wujf/rethinkdb,ayumilong/rethinkdb,losywee/rethinkdb,mquandalle/rethinkdb,grandquista/rethinkdb,RubenKelevra/rethinkdb,sontek/rethinkdb,Wilbeibi/rethinkdb,rrampage/rethinkdb,captainpete/rethinkdb,wojons/rethinkdb,mcanthony/rethinkdb,jmptrader/rethinkdb,ayumilong/rethinkdb,JackieXie168/rethinkdb,captainpete/rethinkdb,rrampage/rethinkdb,wkennington/rethinkdb,KSanthanam/rethinkdb,scripni/rethinkdb,elkingtonmcb/rethinkdb,nviennot/rethinkdb,robertjpayne/rethinkdb,pap/rethinkdb,ajose01/rethinkdb,gdi2290/rethinkdb,sontek/rethinkdb,yakovenkodenis/rethinkdb,RubenKelevra/rethinkdb,losywee/rethinkdb,yakovenkodenis/rethinkdb,matthaywardwebdesign/rethinkdb,bpradipt/rethinkdb,jfriedly/rethinkdb,tempbottle/rethinkdb,ajose01/rethinkdb,elkingtonmcb/rethinkdb,wujf/rethinkdb,mcanthony/rethinkdb,robertjpayne/rethinkdb,sebadiaz/rethinkdb,dparnell/rethinkdb,wkennington/rethinkdb,rrampage/rethinkdb,tempbottle/rethinkdb,wkennington/rethinkdb,catroot/rethinkdb,bpradipt/rethinkdb,greyhwndz/rethinkdb,grandquista/rethinkdb,victorbriz/rethinkdb,yakovenkodenis/rethinkdb,elkingtonmcb/rethinkdb,robertjpayne/rethinkdb,eliangidoni/rethinkdb,gavioto/rethinkdb,4talesa/rethinkdb,jmptrader/rethinkdb,niieani/rethinkdb,robertjpayne/rethinkdb,wkennington/rethinkdb,dparnell/rethinkdb,gavioto/rethinkdb,spblightadv/rethinkdb,jesseditson/rethinkdb,Wilbeibi/rethinkdb,sebadiaz/rethinkdb,sbusso/rethinkdb,4talesa/rethinkdb,yaolinz/rethinkdb,wojons/rethinkdb,urandu/rethinkdb,AntouanK/rethinkdb,sebadiaz/rethinkdb,catroot/rethinkdb,Wilbeibi/rethinkdb,eliangidoni/rethinkdb,alash3al/rethinkdb,RubenKelevra/rethinkdb,ajose01/rethinkdb,mbroadst/rethinkdb,spblightadv/rethinkdb,scripni/rethinkdb,KSanthanam/rethinkdb,marshall007/rethinkdb,lenstr/rethinkdb,Qinusty/rethinkdb,yaolinz/rethinkdb,mquandalle/rethinkdb,lenstr/rethinkdb,spblightadv/rethinkdb,wojons/rethinkdb,sebadiaz/rethinkdb,greyhwndz/rethinkdb,mquandalle/rethinkdb,jfriedly/rethinkdb,Qinusty/rethinkdb,pap/rethinkdb,sbusso/rethinkdb,elkingtonmcb/rethinkdb,grandquista/rethinkdb,pap/rethinkdb,mbroadst/rethinkdb,niieani/rethinkdb,eliangidoni/rethinkdb,robertjpayne/rethinkdb,nviennot/rethinkdb,JackieXie168/rethinkdb,scripni/rethinkdb,4talesa/rethinkdb,nviennot/rethinkdb,mbroadst/rethinkdb,ayumilong/rethinkdb,Wilbeibi/rethinkdb,tempbottle/rethinkdb,robertjpayne/rethinkdb,tempbottle/rethinkdb,bchavez/rethinkdb,bpradipt/rethinkdb,KSanthanam/rethinkdb,JackieXie168/rethinkdb,KSanthanam/rethinkdb,sontek/rethinkdb,urandu/rethinkdb,AntouanK/rethinkdb,bchavez/rethinkdb,victorbriz/rethinkdb,mbroadst/rethinkdb,sebadiaz/rethinkdb,lenstr/rethinkdb,urandu/rethinkdb,ayumilong/rethinkdb,lenstr/rethinkdb,JackieXie168/rethinkdb,bchavez/rethinkdb,mcanthony/rethinkdb,niieani/rethinkdb,wkennington/rethinkdb,matthaywardwebdesign/rethinkdb,yakovenkodenis/rethinkdb,rrampage/rethinkdb,JackieXie168/rethinkdb,alash3al/rethinkdb,mbroadst/rethinkdb,greyhwndz/rethinkdb,jmptrader/rethinkdb,tempbottle/rethinkdb,grandquista/rethinkdb,bpradipt/rethinkdb,nviennot/rethinkdb,ajose01/rethinkdb,sontek/rethinkdb,marshall007/rethinkdb,wujf/rethinkdb,Wilbeibi/rethinkdb,catroot/rethinkdb,JackieXie168/rethinkdb,yaolinz/rethinkdb,alash3al/rethinkdb,victorbriz/rethinkdb,victorbriz/rethinkdb,niieani/rethinkdb,wojons/rethinkdb,elkingtonmcb/rethinkdb,eliangidoni/rethinkdb,urandu/rethinkdb,jesseditson/rethinkdb,robertjpayne/rethinkdb,KSanthanam/rethinkdb,grandquista/rethinkdb,scripni/rethinkdb,pap/rethinkdb,yaolinz/rethinkdb,mcanthony/rethinkdb,bpradipt/rethinkdb,catroot/rethinkdb,wujf/rethinkdb,spblightadv/rethinkdb,jesseditson/rethinkdb,sebadiaz/rethinkdb,greyhwndz/rethinkdb,bpradipt/rethinkdb,elkingtonmcb/rethinkdb,losywee/rethinkdb,lenstr/rethinkdb,RubenKelevra/rethinkdb,jesseditson/rethinkdb,grandquista/rethinkdb,4talesa/rethinkdb,alash3al/rethinkdb,bpradipt/rethinkdb,jmptrader/rethinkdb,mcanthony/rethinkdb,mcanthony/rethinkdb,ajose01/rethinkdb,bpradipt/rethinkdb,Wilbeibi/rethinkdb,niieani/rethinkdb,jmptrader/rethinkdb,mcanthony/rethinkdb,dparnell/rethinkdb,grandquista/rethinkdb,jmptrader/rethinkdb,pap/rethinkdb,wojons/rethinkdb,tempbottle/rethinkdb,RubenKelevra/rethinkdb,alash3al/rethinkdb,nviennot/rethinkdb,matthaywardwebdesign/rethinkdb,grandquista/rethinkdb,KSanthanam/rethinkdb,greyhwndz/rethinkdb,4talesa/rethinkdb,losywee/rethinkdb,eliangidoni/rethinkdb,rrampage/rethinkdb,matthaywardwebdesign/rethinkdb,lenstr/rethinkdb,AntouanK/rethinkdb,greyhwndz/rethinkdb,bchavez/rethinkdb,scripni/rethinkdb,alash3al/rethinkdb,AtnNn/rethinkdb,mquandalle/rethinkdb,niieani/rethinkdb,matthaywardwebdesign/rethinkdb,Qinusty/rethinkdb,marshall007/rethinkdb,Qinusty/rethinkdb,victorbriz/rethinkdb,marshall007/rethinkdb,gdi2290/rethinkdb,captainpete/rethinkdb,eliangidoni/rethinkdb,marshall007/rethinkdb,yaolinz/rethinkdb,mbroadst/rethinkdb,wkennington/rethinkdb,jesseditson/rethinkdb,RubenKelevra/rethinkdb,pap/rethinkdb,captainpete/rethinkdb,scripni/rethinkdb,alash3al/rethinkdb,mquandalle/rethinkdb,AtnNn/rethinkdb,yakovenkodenis/rethinkdb,Qinusty/rethinkdb,dparnell/rethinkdb,wojons/rethinkdb,spblightadv/rethinkdb,captainpete/rethinkdb,matthaywardwebdesign/rethinkdb,rrampage/rethinkdb,AntouanK/rethinkdb,AtnNn/rethinkdb,marshall007/rethinkdb,losywee/rethinkdb,sbusso/rethinkdb,mquandalle/rethinkdb,JackieXie168/rethinkdb,wkennington/rethinkdb,Wilbeibi/rethinkdb,bchavez/rethinkdb,matthaywardwebdesign/rethinkdb,mcanthony/rethinkdb,gavioto/rethinkdb,sontek/rethinkdb,dparnell/rethinkdb,ayumilong/rethinkdb,losywee/rethinkdb,yaolinz/rethinkdb,wujf/rethinkdb,bchavez/rethinkdb,Qinusty/rethinkdb,jfriedly/rethinkdb,RubenKelevra/rethinkdb,greyhwndz/rethinkdb,sbusso/rethinkdb,catroot/rethinkdb,AntouanK/rethinkdb,yakovenkodenis/rethinkdb,nviennot/rethinkdb,jesseditson/rethinkdb,AtnNn/rethinkdb,jfriedly/rethinkdb,JackieXie168/rethinkdb,Qinusty/rethinkdb,ayumilong/rethinkdb,elkingtonmcb/rethinkdb,mbroadst/rethinkdb,sbusso/rethinkdb,wujf/rethinkdb,jesseditson/rethinkdb,pap/rethinkdb,rrampage/rethinkdb,tempbottle/rethinkdb,urandu/rethinkdb