fix conflicts in order_updater_spec
fix conflicts in order_updater_spec

rajeevriitm/spree,ahmetabdi/spree,thogg4/spree,StemboltHQ/spree,ahmetabdi/spree,lsirivong/spree,softr8/spree,jhawthorn/spree,Hates/spree,JDutil/spree,woboinc/spree,tomash/spree,wolfieorama/spree,camelmasa/spree,robodisco/spree,Boomkat/spree,jsurdilla/solidus,gautamsawhney/spree,joanblake/spree,keatonrow/spree,Hawaiideveloper/shoppingcart,vinayvinsol/spree,woboinc/spree,zamiang/spree,biagidp/spree,project-eutopia/spree,mleglise/spree,piousbox/spree,Lostmyname/spree,miyazawatomoka/spree,volpejoaquin/spree,gregoryrikson/spree-sample,trigrass2/spree,delphsoft/spree-store-ballchair,berkes/spree,sunny2601/spree,raow/spree,moneyspyder/spree,freerunningtech/spree,lyzxsc/spree,jordan-brough/spree,groundctrl/spree,surfdome/spree,Engeltj/spree,SadTreeFriends/spree,grzlus/solidus,sunny2601/spree,vmatekole/spree,richardnuno/solidus,archSeer/spree,pervino/spree,grzlus/spree,Senjai/solidus,locomotivapro/spree,Senjai/solidus,LBRapid/spree,degica/spree,keatonrow/spree,volpejoaquin/spree,njerrywerry/spree,forkata/solidus,Nevensoft/spree,tancnle/spree,ckk-scratch/solidus,Boomkat/spree,gregoryrikson/spree-sample,agient/agientstorefront,assembledbrands/spree,alvinjean/spree,carlesjove/spree,derekluo/spree,trigrass2/spree,jordan-brough/solidus,surfdome/spree,jhawthorn/spree,Migweld/spree,gautamsawhney/spree,Senjai/solidus,azclick/spree,odk211/spree,pervino/spree,karlitxo/spree,Kagetsuki/spree,reinaris/spree,ckk-scratch/solidus,bricesanchez/spree,softr8/spree,brchristian/spree,knuepwebdev/FloatTubeRodHolders,shekibobo/spree,lyzxsc/spree,camelmasa/spree,shioyama/spree,scottcrawford03/solidus,hoanghiep90/spree,yomishra/pce,pulkit21/spree,adaddeo/spree,pulkit21/spree,jeffboulet/spree,project-eutopia/spree,lyzxsc/spree,karlitxo/spree,siddharth28/spree,devilcoders/solidus,yiqing95/spree,shekibobo/spree,athal7/solidus,azclick/spree,jaspreet21anand/spree,bonobos/solidus,sunny2601/spree,madetech/spree,wolfieorama/spree,cutefrank/spree,hoanghiep90/spree,madetech/spree,derekluo/spree,useiichi/spree,sfcgeorge/spree,mindvolt/spree,jasonfb/spree,miyazawatomoka/spree,jspizziri/spree,LBRapid/spree,azranel/spree,robodisco/spree,vcavallo/spree,maybii/spree,pervino/solidus,sunny2601/spree,scottcrawford03/solidus,FadliKun/spree,AgilTec/spree,welitonfreitas/spree,yiqing95/spree,jeffboulet/spree,calvinl/spree,progsri/spree,TimurTarasenko/spree,useiichi/spree,Lostmyname/spree,mindvolt/spree,caiqinghua/spree,NerdsvilleCEO/spree,jspizziri/spree,shioyama/spree,vcavallo/spree,beni55/spree,keatonrow/spree,jimblesm/spree,surfdome/spree,firman/spree,derekluo/spree,StemboltHQ/spree,dafontaine/spree,delphsoft/spree-store-ballchair,adaddeo/spree,KMikhaylovCTG/spree,CJMrozek/spree,caiqinghua/spree,azclick/spree,shaywood2/spree,moneyspyder/spree,grzlus/spree,yushine/spree,sfcgeorge/spree,groundctrl/spree,archSeer/spree,jaspreet21anand/spree,hoanghiep90/spree,Kagetsuki/spree,DynamoMTL/spree,Nevensoft/spree,sliaquat/spree,pulkit21/spree,vulk/spree,lsirivong/spree,CiscoCloud/spree,grzlus/spree,rakibulislam/spree,rakibulislam/spree,project-eutopia/spree,net2b/spree,Nevensoft/spree,trigrass2/spree,welitonfreitas/spree,forkata/solidus,omarsar/spree,rbngzlv/spree,Ropeney/spree,forkata/solidus,welitonfreitas/spree,bjornlinder/Spree,lsirivong/solidus,rakibulislam/spree,tomash/spree,adaddeo/spree,priyank-gupta/spree,Arpsara/solidus,lsirivong/spree,TimurTarasenko/spree,agient/agientstorefront,wolfieorama/spree,Hawaiideveloper/shoppingcart,alepore/spree,tancnle/spree,jimblesm/spree,raow/spree,patdec/spree,patdec/spree,Migweld/spree,miyazawatomoka/spree,vinsol/spree,raow/spree,JuandGirald/spree,imella/spree,quentinuys/spree,FadliKun/spree,grzlus/solidus,jsurdilla/solidus,dotandbo/spree,xuewenfei/solidus,JDutil/spree,jordan-brough/solidus,jeffboulet/spree,tancnle/spree,agient/agientstorefront,gregoryrikson/spree-sample,nooysters/spree,ujai/spree,NerdsvilleCEO/spree,jspizziri/spree,camelmasa/spree,fahidnasir/spree,Lostmyname/spree,yushine/spree,alejandromangione/spree,quentinuys/spree,dandanwei/spree,JuandGirald/spree,thogg4/spree,vinsol/spree,patdec/spree,freerunningtech/spree,progsri/spree,ckk-scratch/solidus,lyzxsc/spree,Mayvenn/spree,reinaris/spree,berkes/spree,radarseesradar/spree,firman/spree,priyank-gupta/spree,KMikhaylovCTG/spree,archSeer/spree,jsurdilla/solidus,priyank-gupta/spree,zamiang/spree,nooysters/spree,biagidp/spree,wolfieorama/spree,patdec/spree,shekibobo/spree,APohio/spree,abhishekjain16/spree,useiichi/spree,berkes/spree,devilcoders/solidus,jaspreet21anand/spree,Machpowersystems/spree_mach,cutefrank/spree,piousbox/spree,assembledbrands/spree,builtbybuffalo/spree,SadTreeFriends/spree,pjmj777/spree,builtbybuffalo/spree,Boomkat/spree,zaeznet/spree,pervino/spree,KMikhaylovCTG/spree,vcavallo/spree,yomishra/pce,delphsoft/spree-store-ballchair,siddharth28/spree,vcavallo/spree,kewaunited/spree,TrialGuides/spree,project-eutopia/spree,edgward/spree,carlesjove/spree,alejandromangione/spree,athal7/solidus,NerdsvilleCEO/spree,njerrywerry/spree,cutefrank/spree,Mayvenn/spree,zamiang/spree,moneyspyder/spree,rajeevriitm/spree,lsirivong/solidus,azranel/spree,TrialGuides/spree,yushine/spree,rbngzlv/spree,imella/spree,vinayvinsol/spree,scottcrawford03/solidus,progsri/spree,tesserakt/clean_spree,adaddeo/spree,jparr/spree,jimblesm/spree,devilcoders/solidus,Ropeney/spree,ayb/spree,jhawthorn/spree,calvinl/spree,archSeer/spree,robodisco/spree,agient/agientstorefront,DynamoMTL/spree,PhoenixTeam/spree_phoenix,hifly/spree,groundctrl/spree,surfdome/spree,azranel/spree,DynamoMTL/spree,cutefrank/spree,Hawaiideveloper/shoppingcart,dandanwei/spree,beni55/spree,imella/spree,vinsol/spree,dafontaine/spree,camelmasa/spree,Engeltj/spree,jordan-brough/solidus,TrialGuides/spree,builtbybuffalo/spree,JDutil/spree,dotandbo/spree,LBRapid/spree,Senjai/spree,zaeznet/spree,gautamsawhney/spree,Kagetsuki/spree,alejandromangione/spree,jaspreet21anand/spree,Mayvenn/spree,mindvolt/spree,devilcoders/solidus,omarsar/spree,ramkumar-kr/spree,derekluo/spree,net2b/spree,Lostmyname/spree,rbngzlv/spree,richardnuno/solidus,useiichi/spree,zaeznet/spree,reinaris/spree,alvinjean/spree,odk211/spree,nooysters/spree,mleglise/spree,rakibulislam/spree,robodisco/spree,beni55/spree,moneyspyder/spree,pervino/solidus,dafontaine/spree,locomotivapro/spree,joanblake/spree,TimurTarasenko/spree,Engeltj/spree,degica/spree,SadTreeFriends/spree,watg/spree,CiscoCloud/spree,volpejoaquin/spree,lsirivong/solidus,tomash/spree,Boomkat/spree,dotandbo/spree,yiqing95/spree,softr8/spree,alvinjean/spree,radarseesradar/spree,bonobos/solidus,orenf/spree,njerrywerry/spree,karlitxo/spree,CJMrozek/spree,siddharth28/spree,kewaunited/spree,yomishra/pce,AgilTec/spree,Mayvenn/spree,AgilTec/spree,ayb/spree,Arpsara/solidus,locomotivapro/spree,ayb/spree,vinayvinsol/spree,radarseesradar/spree,bonobos/solidus,mleglise/spree,yiqing95/spree,Senjai/spree,CiscoCloud/spree,FadliKun/spree,dotandbo/spree,pjmj777/spree,tancnle/spree,jordan-brough/solidus,Machpowersystems/spree_mach,quentinuys/spree,fahidnasir/spree,locomotivapro/spree,watg/spree,sideci-sample/sideci-sample-spree,sideci-sample/sideci-sample-spree,ujai/spree,tesserakt/clean_spree,berkes/spree,xuewenfei/solidus,maybii/spree,progsri/spree,ayb/spree,miyazawatomoka/spree,Arpsara/solidus,groundctrl/spree,shaywood2/spree,gautamsawhney/spree,carlesjove/spree,Migweld/spree,Hates/spree,vmatekole/spree,biagidp/spree,maybii/spree,fahidnasir/spree,dafontaine/spree,APohio/spree,siddharth28/spree,brchristian/spree,ramkumar-kr/spree,vmatekole/spree,rajeevriitm/spree,PhoenixTeam/spree_phoenix,volpejoaquin/spree,Migweld/spree,ramkumar-kr/spree,hifly/spree,xuewenfei/solidus,piousbox/spree,jasonfb/spree,Hawaiideveloper/shoppingcart,KMikhaylovCTG/spree,athal7/solidus,Senjai/spree,orenf/spree,CJMrozek/spree,tailic/spree,dandanwei/spree,caiqinghua/spree,xuewenfei/solidus,nooysters/spree,knuepwebdev/FloatTubeRodHolders,net2b/spree,Senjai/solidus,tailic/spree,firman/spree,carlesjove/spree,yushine/spree,jordan-brough/spree,gregoryrikson/spree-sample,StemboltHQ/spree,DynamoMTL/spree,sliaquat/spree,vinsol/spree,raow/spree,RatioClothing/spree,shioyama/spree,beni55/spree,zaeznet/spree,scottcrawford03/solidus,JuandGirald/spree,shaywood2/spree,zamiang/spree,Nevensoft/spree,jparr/spree,DarkoP/spree,jasonfb/spree,radarseesradar/spree,TimurTarasenko/spree,Hates/spree,alejandromangione/spree,shaywood2/spree,JuandGirald/spree,sliaquat/spree,DarkoP/spree,edgward/spree,thogg4/spree,bjornlinder/Spree,Hates/spree,NerdsvilleCEO/spree,tesserakt/clean_spree,njerrywerry/spree,joanblake/spree,FadliKun/spree,odk211/spree,alepore/spree,joanblake/spree,softr8/spree,richardnuno/solidus,brchristian/spree,calvinl/spree,woboinc/spree,kewaunited/spree,hifly/spree,vmatekole/spree,shekibobo/spree,freerunningtech/spree,edgward/spree,DarkoP/spree,reinaris/spree,mleglise/spree,Engeltj/spree,APohio/spree,pervino/spree,orenf/spree,Machpowersystems/spree_mach,PhoenixTeam/spree_phoenix,lsirivong/spree,karlitxo/spree,madetech/spree,vulk/spree,delphsoft/spree-store-ballchair,DarkoP/spree,priyank-gupta/spree,maybii/spree,abhishekjain16/spree,Arpsara/solidus,rbngzlv/spree,jparr/spree,jspizziri/spree,degica/spree,orenf/spree,omarsar/spree,watg/spree,pervino/solidus,jimblesm/spree,ujai/spree,ahmetabdi/spree,tomash/spree,AgilTec/spree,TrialGuides/spree,athal7/solidus,tesserakt/clean_spree,azclick/spree,jeffboulet/spree,builtbybuffalo/spree,CJMrozek/spree,vulk/spree,trigrass2/spree,bonobos/solidus,ahmetabdi/spree,sfcgeorge/spree,azranel/spree,reidblomquist/spree,vinayvinsol/spree,hifly/spree,alepore/spree,forkata/solidus,Kagetsuki/spree,reidblomquist/spree,alvinjean/spree,PhoenixTeam/spree_phoenix,Ropeney/spree,edgward/spree,richardnuno/solidus,jsurdilla/solidus,welitonfreitas/spree,vulk/spree,omarsar/spree,JDutil/spree,rajeevriitm/spree,keatonrow/spree,bricesanchez/spree,abhishekjain16/spree,tailic/spree,calvinl/spree,thogg4/spree,fahidnasir/spree,reidblomquist/spree,grzlus/solidus,CiscoCloud/spree,RatioClothing/spree,sliaquat/spree,ckk-scratch/solidus,net2b/spree,dandanwei/spree,ramkumar-kr/spree,assembledbrands/spree,sideci-sample/sideci-sample-spree,odk211/spree,jasonfb/spree,reidblomquist/spree,jparr/spree,piousbox/spree,Ropeney/spree,knuepwebdev/FloatTubeRodHolders,hoanghiep90/spree,mindvolt/spree,sfcgeorge/spree,bjornlinder/Spree,madetech/spree,jordan-brough/spree,kewaunited/spree,caiqinghua/spree,RatioClothing/spree,APohio/spree,pulkit21/spree,bricesanchez/spree,SadTreeFriends/spree,quentinuys/spree,lsirivong/solidus,pervino/solidus,grzlus/solidus,firman/spree,pjmj777/spree,brchristian/spree,grzlus/spree,abhishekjain16/spree