Update test cases to reflect new conflict option.
Update test cases to reflect new conflict option.

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