fix merge conflict
fix merge conflict

chyeh727/backbone,ThiagoGarciaAlves/backbone,tadwhitaker/backbone,jewsroch/backbone,zhangdimelody/backbone,jasoncbautista/backboneX,dcheepurupalli/backbone,gmaclennan/backbone,braddunbar/backbone,wangcan2014/backbone,streamablevideo/backbone,guigrpa/backbone,Niades/backbone,cailong1028/backbone,cgvarela/backbone,liudianpeng/backbone,chyeh727/backbone,vin100bk/backbone,streamablevideo/backbone,liudianpeng/backbone,aihua/backbone,wjb12/backbone,Diwahars/backbone,platinumazure/backbone,Krasnyanskiy/backbone,jungjung917/backbone,elma-cao/backbone,yawenl/backbone,braddunbar/backbone,zgl2007dj/backbone,GrimDerp/backbone,jridgewell/backbone,sitexa/backbone,wjb12/backbone,lujocom/backbone,gougouGet/backbone,howtolearntocode/backbone,nvoron23/backbone,sunday-star/backbone,anhtholee/backbone,IsoldaJS/isolda-models,rashmisajjan/backbone,sumyfly/backbone,nvoron23/backbone,wxmfront/backbone,craigmichaelmartin/backbone,pandoraui/backbone,lastjune/backbone,gdi2290/backbone,mrblueblue/backbone,trizko/backbone,getshuvo/backbone,Flip120/backbone,youprofit/backbone,darrrk/backbone,wangdahoo/backbone,lujocom/backbone,linalu1/backbone,zhangwei001/backbone,tibic/backbone,huanglp47/backbone,linalu1/backbone,jungjung917/backbone,wangdahoo/backbone,guahanweb/backbone,7213/backbone,dak/backbone,akre54/backbone,ywenjinlin/backbone,nikolas/backbone,premkumargithub/backbone,moccen/backbone,fanhc019/backbone,sueyeh/backbone,tadwhitaker/backbone,oss-practice/backbone,closeio/backbone,aihua/backbone,DannyDelott/backbone,Connectlegendary/backbone,wxmfront/backbone,udhayam/backbone,ppker/backbone,jmeas/backbone,premkumargithub/backbone,Sachin-Ganesh/backbone,leimd/backbone,jmeas/backbone,ywenjinlin/backbone,heroazure/backbone,Krasnyanskiy/backbone,ridixcr/backbone,timebackzhou/backbone,yawenl/backbone,anhtholee/backbone,darrrk/backbone,Diwahars/backbone,jordansexton/backboner,DannyDelott/backbone,zhangdimelody/backbone,akre54/backbone,craigmichaelmartin/backbone,tibic/backbone,jashkenas/backbone,gmaclennan/backbone,yuhualingfeng/backbone,ridixcr/backbone,feychenie/backbone,cgvarela/backbone,ntgn81/backbone,neocotic/hipbone,getshuvo/backbone,youprofit/backbone,au-phiware/backbone,elma-cao/backbone,elancom/backbone,Connectlegendary/backbone,jridgewell/backbone,mrblueblue/backbone,zhangwei001/backbone,kuychaco/backbone,zdespolit/backbone,ohbarye/backbone,webcoding/backbone,vincent1988/backbone,yuhualingfeng/backbone,heroazure/backbone,IsoldaJS/isolda-pubsub,zgl2007dj/backbone,wushuyi/backbone,alekskorolev/lightbones,FishbaitHarry/backbone,huanglp47/backbone,paulfalgout/backbone,dcheepurupalli/backbone,rashmisajjan/backbone,7213/backbone,ereddate/backbone,vin100bk/backbone,ereddate/backbone,howtolearntocode/backbone,ohbarye/backbone,neocotic/hipbone,vincent1988/backbone,timebackzhou/backbone,kuychaco/backbone,cailong1028/backbone,embarknow/backbone,wangcan2014/backbone,jashkenas/backbone,closeio/backbone,sueyeh/backbone,sumyfly/backbone,platinumazure/backbone,gougouGet/backbone,lastjune/backbone,GrimDerp/backbone,zhoufan879/backbone,feychenie/backbone,dak/backbone,Sachin-Ganesh/backbone,sitexa/backbone,wushuyi/backbone,zdespolit/backbone,npmcomponent/jashkenas-backbone,ntgn81/backbone,hugohua/backbone,embarknow/backbone,moimikey/backbone,Bug2014/backbone,webcoding/backbone,leimd/backbone,trizko/backbone,tzkKrbys/backbone,alekskorolev/lightbones,megawac/backbone,Niades/backbone,moccen/backbone,amitpatange88/backbonejs,JesseQin/backbone,FormidableLabs/backbone,sunday-star/backbone,tzkKrbys/backbone,guahanweb/backbone,rjz/boneless,jewsroch/backbone,au-phiware/backbone,paulfalgout/backbone,nikolas/backbone,fanhc019/backbone,FishbaitHarry/backbone,amitpatange88/backbonejs,udhayam/backbone,pandoraui/backbone,Flip120/backbone,zhoufan879/backbone,ThiagoGarciaAlves/backbone,moimikey/backbone,Bug2014/backbone,ppker/backbone,elancom/backbone,JesseQin/backbone