remove bad merge conflict resolution
remove bad merge conflict resolution

nvwls/chef,aaron-lane/chef,circleback/chef,faspl/chef,cgvarela/chef,malisettirammurthy/chef,martinisoft/chef,cgvarela/chef,nguyen-tien-mulodo/chef,Ppjet6/chef,mikedodge04/chef,robmul/chef,BackSlasher/chef,youngjl1/chef,webframp/chef,youngjl1/chef,chef/chef,higanworks/chef,faspl/chef,nguyen-tien-mulodo/chef,mikedodge04/chef,Tensibai/chef,docwhat/chef,acaiafa/chef,malisettirammurthy/chef,malisettirammurthy/chef,smurawski/chef,tomdoherty/chef,gene1wood/chef,gsaslis/chef,clintoncwolfe/chef,oclaussen/chef,sekrett/chef,OpSitters/chef,sekrett/chef,aaron-lane/chef,brettcave/chef,adamleff/chef,juliandunn/chef,gene1wood/chef,permyakovsv/chef,jkerry/chef,cgvarela/chef,jonlives/chef,erkolson/chef,baberthal/chef,mal/chef,Kast0rTr0y/chef,BackSlasher/chef,ducthanh/chef,josb/chef,ducthanh/chef,nicklv/chef,mwrock/chef,nvwls/chef,nvwls/chef,malisettirammurthy/chef,smurawski/chef,permyakovsv/chef,permyakovsv/chef,EasonYi/chef,Ppjet6/chef,erkolson/chef,h4ck3rm1k3/chef,martinisoft/chef,zuazo-forks/chef,aaron-lane/chef,malisettirammurthy/chef,youngjl1/chef,mikedodge04/chef,tbunnyman/chef,higanworks/chef,Ppjet6/chef,tas50/chef-1,mal/chef,tas50/chef-1,tbriggs-curse/chef,criteo-forks/chef,BackSlasher/chef,faspl/chef,MsysTechnologiesllc/chef,b002368/chef-repo,nsdavidson/chef,h4ck3rm1k3/chef,AndyBoucher/Chef-Testing,mattray/chef,sanditiffin/chef,brettcave/chef,sekrett/chef,h4ck3rm1k3/chef,b002368/chef-repo,mwrock/chef,permyakovsv/chef,criteo-forks/chef,gene1wood/chef,custora/chef,kaznishi/chef,brettcave/chef,h4ck3rm1k3/chef,nicklv/chef,gsaslis/chef,zuazo-forks/chef,3dinfluence/chef,nvwls/chef,strangelittlemonkey/chef,oclaussen/chef,Ppjet6/chef,ktpan/chef-play,strangelittlemonkey/chef,erkolson/chef,mio-g/chef,juliandunn/chef,mwrock/chef,Ppjet6/chef,jkerry/chef,evan2645/chef,ducthanh/chef,chef/chef,robmul/chef,clintoncwolfe/chef,antonifs/chef,erkolson/chef,cgvarela/chef,mio-g/chef,b002368/chef-repo,nvwls/chef,adamleff/chef,zuazo-forks/chef,circleback/chef,AndyBoucher/Chef-Testing,nicklv/chef,3dinfluence/chef,strangelittlemonkey/chef,mattray/chef,jaymzh/chef,juliandunn/chef,baberthal/chef,ducthanh/chef,ktpan/chef-play,josb/chef,juliandunn/chef,b002368/chef-repo,permyakovsv/chef,adamleff/chef,josb/chef,tbriggs-curse/chef,tbriggs-curse/chef,MichaelPereira/chef,evan2645/chef,MsysTechnologiesllc/chef,MichaelPereira/chef,someara/chef,nguyen-tien-mulodo/chef,OpSitters/chef,lamont-granquist/chef,BackSlasher/chef,nvwls/chef,kaznishi/chef,tomdoherty/chef,MichaelPereira/chef,mal/chef,youngjl1/chef,criteo-forks/chef,circleback/chef,b002368/chef-repo,cgvarela/chef,onlyhavecans/chef,jonlives/chef,jaymzh/chef,onlyhavecans/chef,smurawski/chef,mal/chef,jonlives/chef,adamleff/chef,higanworks/chef,gsaslis/chef,nathwill/chef,oclaussen/chef,robmul/chef,someara/chef,antonifs/chef,Kast0rTr0y/chef,webframp/chef,tomdoherty/chef,nathwill/chef,ChaosCloud/chef,EasonYi/chef,antonifs/chef,docwhat/chef,acaiafa/chef,mikedodge04/chef,ranjib/chef,clintoncwolfe/chef,higanworks/chef,mikedodge04/chef,sanditiffin/chef,ChaosCloud/chef,smurawski/chef,Kast0rTr0y/chef,zuazo-forks/chef,natewalck/chef,webframp/chef,Kast0rTr0y/chef,ranjib/chef,adamleff/chef,aaron-lane/chef,lamont-granquist/chef,tomdoherty/chef,robmul/chef,docwhat/chef,Kast0rTr0y/chef,permyakovsv/chef,baberthal/chef,ducthanh/chef,sanditiffin/chef,tbunnyman/chef,sekrett/chef,EasonYi/chef,nguyen-tien-mulodo/chef,lamont-granquist/chef,zuazo-forks/chef,jk47/chef,acaiafa/chef,strangelittlemonkey/chef,lamont-granquist/chef,natewalck/chef,nsdavidson/chef,martinisoft/chef,circleback/chef,jaymzh/chef,clintoncwolfe/chef,gsaslis/chef,nsdavidson/chef,brettcave/chef,sekrett/chef,lamont-granquist/chef,tbunnyman/chef,smurawski/chef,onlyhavecans/chef,jk47/chef,mal/chef,faspl/chef,evan2645/chef,tas50/chef-1,antonifs/chef,jkerry/chef,custora/chef,MichaelPereira/chef,ranjib/chef,natewalck/chef,MichaelPereira/chef,lamont-granquist/chef,natewalck/chef,BackSlasher/chef,tas50/chef-1,someara/chef,nguyen-tien-mulodo/chef,ranjib/chef,evan2645/chef,webframp/chef,clintoncwolfe/chef,mikedodge04/chef,brettcave/chef,nsdavidson/chef,Kast0rTr0y/chef,jkerry/chef,ktpan/chef-play,mattray/chef,tbriggs-curse/chef,ChaosCloud/chef,jonlives/chef,ranjib/chef,jkerry/chef,zuazo-forks/chef,oclaussen/chef,smurawski/chef,Tensibai/chef,evan2645/chef,chef/chef,EasonYi/chef,3dinfluence/chef,youngjl1/chef,someara/chef,kaznishi/chef,OpSitters/chef,webframp/chef,kaznishi/chef,onlyhavecans/chef,brettcave/chef,3dinfluence/chef,faspl/chef,custora/chef,natewalck/chef,custora/chef,custora/chef,mattray/chef,nsdavidson/chef,nicklv/chef,strangelittlemonkey/chef,oclaussen/chef,aaron-lane/chef,AndyBoucher/Chef-Testing,docwhat/chef,AndyBoucher/Chef-Testing,ChaosCloud/chef,nathwill/chef,tbriggs-curse/chef,onlyhavecans/chef,nicklv/chef,tbriggs-curse/chef,tbunnyman/chef,ranjib/chef,nicklv/chef,OpSitters/chef,docwhat/chef,juliandunn/chef,nathwill/chef,cgvarela/chef,circleback/chef,erkolson/chef,baberthal/chef,erkolson/chef,mio-g/chef,OpSitters/chef,youngjl1/chef,3dinfluence/chef,natewalck/chef,criteo-forks/chef,jk47/chef,ktpan/chef-play,higanworks/chef,mio-g/chef,h4ck3rm1k3/chef,Tensibai/chef,acaiafa/chef,adamleff/chef,jkerry/chef,BackSlasher/chef,mwrock/chef,tbunnyman/chef,oclaussen/chef,ChaosCloud/chef,3dinfluence/chef,evan2645/chef,faspl/chef,ChaosCloud/chef,sanditiffin/chef,martinisoft/chef,EasonYi/chef,chef/chef,acaiafa/chef,josb/chef,nguyen-tien-mulodo/chef,nathwill/chef,mio-g/chef,tbunnyman/chef,gene1wood/chef,robmul/chef,MsysTechnologiesllc/chef,martinisoft/chef,Tensibai/chef,ktpan/chef-play,OpSitters/chef,ktpan/chef-play,gsaslis/chef,clintoncwolfe/chef,EasonYi/chef,malisettirammurthy/chef,criteo-forks/chef,MsysTechnologiesllc/chef,ducthanh/chef,aaron-lane/chef,jk47/chef,sekrett/chef,criteo-forks/chef,someara/chef,baberthal/chef,nsdavidson/chef,kaznishi/chef,josb/chef,josb/chef,gsaslis/chef,docwhat/chef,h4ck3rm1k3/chef,kaznishi/chef,jonlives/chef,onlyhavecans/chef,Ppjet6/chef,sanditiffin/chef,AndyBoucher/Chef-Testing,b002368/chef-repo,robmul/chef,jk47/chef,jaymzh/chef,baberthal/chef,MichaelPereira/chef,Tensibai/chef,tomdoherty/chef,custora/chef,strangelittlemonkey/chef,nathwill/chef,webframp/chef,jonlives/chef,antonifs/chef,jk47/chef,mattray/chef,circleback/chef,mio-g/chef,sanditiffin/chef,mal/chef,someara/chef,AndyBoucher/Chef-Testing,acaiafa/chef,antonifs/chef