fixed another merge conflict
fixed another merge conflict

JacquesMarais/cdnjs,kirbyfan64/cdnjs,bragma/cdnjs,dominic/cdnjs,SanaNasar/cdnjs,legomushroom/cdnjs,fatso83/cdnjs,hibrahimsafak/cdnjs,dhenson02/cdnjs,matteofigus/cdnjs,neveldo/cdnjs,thejsj/cdnjs,andersem/cdnjs,fatso83/cdnjs,jamzgoodguy/cdnjs,koggdal/cdnjs,dhenson02/cdnjs,idleberg/cdnjs,mikelambert/cdnjs,jdanyow/cdnjs,r3x/cdnjs,nagyist/OpenF2-cdnjs,binaek89/cdnjs,LaurensRietveld/cdnjs,gasolin/cdnjs,mrehayden1/cdnjs,mgoldsborough/cdnjs,dominicrico/cdnjs,pcarrier/cdnjs,dbeckwith/cdnjs,OnsenUI/cdnjs,dhowe/cdnjs,urish/cdnjs,pazguille/cdnjs,francescoagati/cdnjs,pazguille/cdnjs,hcxiong/cdnjs,icco/cdnjs,askehansen/cdnjs,RubaXa/cdnjs,MMore/cdnjs,francescoagati/cdnjs,jimmybyrum/cdnjs,nareshs435/cdnjs,nesk/cdnjs,svvitale/cdnjs,sarmadsangi/cdnjs,ramda/cdnjs,cluo/cdnjs,Ryuno-Ki/cdnjs,andrepiske/cdnjs,gasolin/cdnjs,emmansun/cdnjs,steve-ng/cdnjs,gokuale/cdnjs,FaiblUG/cdnjs,siddii/cdnjs,aeharding/cdnjs,luhad/cdnjs,KevinSheedy/cdnjs,CrossEye/cdnjs,hibrahimsafak/cdnjs,ljharb/cdnjs,agraebe/cdnjs,ljharb/cdnjs,svenanders/cdnjs,advancedpartnerships/cdnjs,KevinSheedy/cdnjs,paleozogt/cdnjs,DaAwesomeP/cdnjs,iskitz/cdnjs,fk/cdnjs,iskitz/cdnjs,nesk/cdnjs,mzdani/cdnjs,wenliang-developer/cdnjs,jozefizso/cdnjs,bevacqua/cdnjs,contentfree/cdnjs,ekeneijeoma/cdnjs,LorenzoBoccaccia/cdnjs,barkinet/cdnjs,Kaakati/cdnjs,xymostech/cdnjs,svenanders/cdnjs,JohnKim/cdnjs,jakubfiala/cdnjs,ruo91/cdnjs,robinskumar73/cdnjs,mrehayden1/cdnjs,karlfreeman/cdnjs,jimmybyrum/cdnjs,svenanders/cdnjs,aeharding/cdnjs,tambien/cdnjs,kirbyfan64/cdnjs,aashish24/cdnjs,JacquesMarais/cdnjs,LSleutsky/cdnjs,svvitale/cdnjs,Kaakati/cdnjs,nagyist/OpenF2-cdnjs,DeuxHuitHuit/cdnjs,jacoborus/cdnjs,aeharding/cdnjs,stuartpb/cdnjs,camelotceo/cdnjs,Rich-Harris/cdnjs,jamzgoodguy/cdnjs,gereon/cdnjs,ericelliott/cdnjs,calvinf/cdnjs,jieter/cdnjs,mikaelbr/cdnjs,jakubfiala/cdnjs,jamesarosen/cdnjs,andersem/cdnjs,aashish24/cdnjs,mayur404/cdnjs,codfish/cdnjs,kenwheeler/cdnjs,ekeneijeoma/cdnjs,arasmussen/cdnjs,baig/cdnjs,gogoleva/cdnjs,FaiblUG/cdnjs,RubaXa/cdnjs,RizkyAdiSaputra/cdnjs,fatso83/cdnjs,wenliang-developer/cdnjs,xymostech/cdnjs,urish/cdnjs,khasinski/cdnjs,thesandlord/cdnjs,ematsusaka/cdnjs,andersem/cdnjs,advancedpartnerships/cdnjs,Rich-Harris/cdnjs,steakknife/cdnjs,thejsj/cdnjs,gagan-bansal/cdnjs,dhenson02/cdnjs,askehansen/cdnjs,rivanvx/cdnjs,thejsj/cdnjs,legomushroom/cdnjs,ZDroid/cdnjs,dhowe/cdnjs,xubowenjx/cdnjs,aFarkas/cdnjs,rteasdale/cdnjs,xymostech/cdnjs,lukeapage/cdnjs,viskin/cdnjs,icco/cdnjs,idleberg/cdnjs,RubaXa/cdnjs,viskin/cdnjs,mzdani/cdnjs,anshulverma/cdnjs,bdukes/cdnjs,OnsenUI/cdnjs,kenwheeler/cdnjs,jozefizso/cdnjs,kirbyfan64/cdnjs,jessepollak/cdnjs,contentfree/cdnjs,xeodou/cdnjs,svenanders/cdnjs,johan-gorter/cdnjs,NamPNQ/cdnjs,DaAwesomeP/cdnjs,bragma/cdnjs,bdukes/cdnjs,chrisdavies/cdnjs,JacquesMarais/cdnjs,joseluisq/cdnjs,barkinet/cdnjs,shallaa/cdnjs,yogeshsaroya/cdnjs,ekeneijeoma/cdnjs,joeylakay/cdnjs,nesk/cdnjs,maxklenk/cdnjs,ramda/cdnjs,matteofigus/cdnjs,yukinying/cdnjs,jmusicc/cdnjs,eduardo-costa/cdnjs,CosmicWebServices/cdnjs,bragma/cdnjs,zhengyongbo/cdnjs,dominic/cdnjs,LorenzoBoccaccia/cdnjs,djavaui/cdnjs,nagyist/OpenF2-cdnjs,hcxiong/cdnjs,freak3dot/cdnjs,tengyifei/cdnjs,chrillep/cdnjs,steakknife/cdnjs,stuartpb/cdnjs,SanaNasar/cdnjs,camelotceo/cdnjs,LSleutsky/cdnjs,mgoldsborough/cdnjs,tresni/cdnjs,StoneCypher/cdnjs,JohnKim/cdnjs,kenwheeler/cdnjs,aeharding/cdnjs,Rich-Harris/cdnjs,bragma/cdnjs,koggdal/cdnjs,zhangbg/cdnjs,jackdoyle/cdnjs,tengyifei/cdnjs,CrossEye/cdnjs,jimmybyrum/cdnjs,jamesarosen/cdnjs,robinskumar73/cdnjs,JacquesMarais/cdnjs,idleberg/cdnjs,tambien/cdnjs,gagan-bansal/cdnjs,sujonvidia/cdnjs,ripple0328/cdnjs,kristoferjoseph/cdnjs,ramda/cdnjs,AlexisArce/cdnjs,ruo91/cdnjs,jmusicc/cdnjs,gogoleva/cdnjs,vdurmont/cdnjs,anshulverma/cdnjs,billybonz1/cdnjs,jozefizso/cdnjs,luhad/cdnjs,francescoagati/cdnjs,hibrahimsafak/cdnjs,jieter/cdnjs,maxklenk/cdnjs,agraebe/cdnjs,RizkyAdiSaputra/cdnjs,AlicanC/cdnjs,abbychau/cdnjs,abbychau/cdnjs,Kaakati/cdnjs,ramda/cdnjs,kood1/cdnjs,senekis/cdnjs,raszi/cdnjs,anshulverma/cdnjs,coupang/cdnjs,jdanyow/cdnjs,MEXXIO/cdnjs,NamPNQ/cdnjs,vfonic/cdnjs,Enelar/cdnjs,chrisdavies/cdnjs,DeuxHuitHuit/cdnjs,rivanvx/cdnjs,Sneezry/cdnjs,tkirda/cdnjs,emmansun/cdnjs,luigimannoni/cdnjs,jdanyow/cdnjs,KevinSheedy/cdnjs,luigimannoni/cdnjs,urish/cdnjs,akiran/cdnjs,StoneCypher/cdnjs,peteygao/cdnjs,fastest963/cdnjs,pzp1997/cdnjs,AlicanC/cdnjs,jemmy655/cdnjs,wenliang-developer/cdnjs,tmorin/cdnjs,Nadeermalangadan/cdnjs,jacoborus/cdnjs,tomsoir/cdnjs,noraesae/cdnjs,Ryuno-Ki/cdnjs,fk/cdnjs,xeodou/cdnjs,ramda/cdnjs,Ryuno-Ki/cdnjs,aFarkas/cdnjs,visualjeff/cdnjs,StoneCypher/cdnjs,dbeckwith/cdnjs,hpneo/cdnjs,mathiasrw/cdnjs,johan-gorter/cdnjs,Enelar/cdnjs,schoren/cdnjs,hpneo/cdnjs,Ryuno-Ki/cdnjs,contentfree/cdnjs,FaiblUG/cdnjs,XVicarious/cdnjs,CosmicWebServices/cdnjs,baig/cdnjs,matteofigus/cdnjs,vdurmont/cdnjs,xubowenjx/cdnjs,ripple0328/cdnjs,svenanders/cdnjs,coupang/cdnjs,underyx/cdnjs,icco/cdnjs,vdurmont/cdnjs,bevacqua/cdnjs,mikaelbr/cdnjs,mikelambert/cdnjs,francescoagati/cdnjs,joseluisq/cdnjs,CosmicWebServices/cdnjs,sarmadsangi/cdnjs,ruiaraujo/cdnjs,hibrahimsafak/cdnjs,nagyist/OpenF2-cdnjs,GaryChamberlain/cdnjs,tengyifei/cdnjs,warpech/cdnjs,djavaui/cdnjs,jaslernl/cdnjs,kentucky-roberts/cdnjs,francescoagati/cdnjs,gswalden/cdnjs,ErikSchierboom/cdnjs,johan-gorter/cdnjs,sullivanmatt/cdnjs,steakknife/cdnjs,XVicarious/cdnjs,LSleutsky/cdnjs,gereon/cdnjs,legomushroom/cdnjs,reustle/cdnjs,jemmy655/cdnjs,mirthy/cdnjs,matteofigus/cdnjs,luigimannoni/cdnjs,rivanvx/cdnjs,jieter/cdnjs,StoneCypher/cdnjs,gereon/cdnjs,LorenzoBoccaccia/cdnjs,eduardo-costa/cdnjs,lukeapage/cdnjs,AlicanC/cdnjs,algolia/cdnjs,gereon/cdnjs,andrepiske/cdnjs,wenliang-developer/cdnjs,viskin/cdnjs,nesk/cdnjs,jacoborus/cdnjs,mzdani/cdnjs,johan-gorter/cdnjs,sujonvidia/cdnjs,XVicarious/cdnjs,cluo/cdnjs,sarmadsangi/cdnjs,CosmicWebServices/cdnjs,andrepiske/cdnjs,fk/cdnjs,baig/cdnjs,gswalden/cdnjs,ruiaraujo/cdnjs,sullivanmatt/cdnjs,aeharding/cdnjs,CrossEye/cdnjs,CrossEye/cdnjs,bdukes/cdnjs,qooxdoo/cdnjs,advancedpartnerships/cdnjs,viskin/cdnjs,mrehayden1/cdnjs,kentucky-roberts/cdnjs,CosmicWebServices/cdnjs,MEXXIO/cdnjs,rteasdale/cdnjs,hcxiong/cdnjs,yukinying/cdnjs,Kaakati/cdnjs,siddii/cdnjs,kirbyfan64/cdnjs,a8m/cdnjs,Sneezry/cdnjs,ruiaraujo/cdnjs,hanssens/cdnjs,DeuxHuitHuit/cdnjs,jaslernl/cdnjs,sitic/cdnjs,lmccart/cdnjs,nagyist/OpenF2-cdnjs,ematsusaka/cdnjs,askehansen/cdnjs,jakubfiala/cdnjs,MEXXIO/cdnjs,shallaa/cdnjs,schoren/cdnjs,GaryChamberlain/cdnjs,svvitale/cdnjs,fastest963/cdnjs,tmorin/cdnjs,CrossEye/cdnjs,rigdern/cdnjs,andersem/cdnjs,akiran/cdnjs,akiran/cdnjs,iskitz/cdnjs,fbender/cdnjs,xymostech/cdnjs,thejsj/cdnjs,mrehayden1/cdnjs,kenwheeler/cdnjs,khasinski/cdnjs,wenzhixin/cdnjs,sullivanmatt/cdnjs,camelotceo/cdnjs,tkirda/cdnjs,stefanocudini/cdnjs,Flo-Schield-Bobby/cdnjs,fatso83/cdnjs,joeylakay/cdnjs,sarmadsangi/cdnjs,neveldo/cdnjs,ThibWeb/cdnjs,ThibWeb/cdnjs,jozefizso/cdnjs,jieter/cdnjs,vdurmont/cdnjs,jessepollak/cdnjs,fk/cdnjs,kristoferjoseph/cdnjs,SanaNasar/cdnjs,gokuale/cdnjs,iros/cdnjs,gswalden/cdnjs,idleberg/cdnjs,warpech/cdnjs,mikelambert/cdnjs,cluo/cdnjs,raszi/cdnjs,RizkyAdiSaputra/cdnjs,steve-ng/cdnjs,underyx/cdnjs,Nadeermalangadan/cdnjs,r3x/cdnjs,AlicanC/cdnjs,tomsoir/cdnjs,djavaui/cdnjs,joseluisq/cdnjs,bsquochoaidownloadfolders/cdnjs,tresni/cdnjs,ruo91/cdnjs,RobLoach/cdnjs,karlfreeman/cdnjs,RubaXa/cdnjs,ankitjamuar/cdnjs,bsquochoaidownloadfolders/cdnjs,stefanocudini/cdnjs,chrillep/cdnjs,agraebe/cdnjs,ripple0328/cdnjs,gaearon/cdnjs,rigdern/cdnjs,vfonic/cdnjs,karlfreeman/cdnjs,bragma/cdnjs,steve-ng/cdnjs,fredericksilva/cdnjs,iskitz/cdnjs,qooxdoo/cdnjs,RobLoach/cdnjs,robinskumar73/cdnjs,askehansen/cdnjs,andrepiske/cdnjs,brunoksato/cdnjs,ErikSchierboom/cdnjs,jmusicc/cdnjs,ruiaraujo/cdnjs,HealthIndicators/cdnjs,bevacqua/cdnjs,LaurensRietveld/cdnjs,jackdoyle/cdnjs,ruo91/cdnjs,zhangbg/cdnjs,jmusicc/cdnjs,NamPNQ/cdnjs,stefanocudini/cdnjs,ThibWeb/cdnjs,bdukes/cdnjs,andyinabox/cdnjs,gagan-bansal/cdnjs,brunoksato/cdnjs,vdurmont/cdnjs,thejsj/cdnjs,senekis/cdnjs,mayur404/cdnjs,tomsoir/cdnjs,noraesae/cdnjs,JacquesMarais/cdnjs,freak3dot/cdnjs,algolia/cdnjs,underyx/cdnjs,brunoksato/cdnjs,MMore/cdnjs,jamzgoodguy/cdnjs,iskitz/cdnjs,hanssens/cdnjs,peteygao/cdnjs,visualjeff/cdnjs,hibrahimsafak/cdnjs,sullivanmatt/cdnjs,mikaelbr/cdnjs,gogoleva/cdnjs,F2X/cdnjs,artch/cdnjs,gasolin/cdnjs,mirthy/cdnjs,reustle/cdnjs,mirthy/cdnjs,fatso83/cdnjs,mzdani/cdnjs,jemmy655/cdnjs,Flo-Schield-Bobby/cdnjs,yogeshsaroya/cdnjs,andersem/cdnjs,lmccart/cdnjs,LaurensRietveld/cdnjs,robinskumar73/cdnjs,jakubfiala/cdnjs,LSleutsky/cdnjs,mathiasrw/cdnjs,matteofigus/cdnjs,tomsoir/cdnjs,kood1/cdnjs,gaearon/cdnjs,LSleutsky/cdnjs,pcarrier/cdnjs,gagan-bansal/cdnjs,StoneCypher/cdnjs,ripple0328/cdnjs,camelotceo/cdnjs,mikaelbr/cdnjs,arasmussen/cdnjs,codfish/cdnjs,fredericksilva/cdnjs,JohnKim/cdnjs,kentucky-roberts/cdnjs,brunoksato/cdnjs,wenzhixin/cdnjs,pzp1997/cdnjs,steakknife/cdnjs,zhengyongbo/cdnjs,Kaakati/cdnjs,reustle/cdnjs,aFarkas/cdnjs,jamesarosen/cdnjs,jimmybyrum/cdnjs,xeodou/cdnjs,jaslernl/cdnjs,gasolin/cdnjs,fastest963/cdnjs,JohnKim/cdnjs,F2X/cdnjs,fbender/cdnjs,senekis/cdnjs,jozefizso/cdnjs,Enelar/cdnjs,AlicanC/cdnjs,calvinf/cdnjs,nareshs435/cdnjs,jamzgoodguy/cdnjs,peteygao/cdnjs,mzdani/cdnjs,sullivanmatt/cdnjs,mayur404/cdnjs,rivanvx/cdnjs,siddii/cdnjs,ankitjamuar/cdnjs,lukeapage/cdnjs,hanssens/cdnjs,jieter/cdnjs,Rich-Harris/cdnjs,sitic/cdnjs,visualjeff/cdnjs,jamzgoodguy/cdnjs,andyinabox/cdnjs,billybonz1/cdnjs,hanssens/cdnjs,icco/cdnjs,camelotceo/cdnjs,RizkyAdiSaputra/cdnjs,underyx/cdnjs,icco/cdnjs,cluo/cdnjs,Rich-Harris/cdnjs,ZDroid/cdnjs,urish/cdnjs,advancedpartnerships/cdnjs,luigimannoni/cdnjs,askehansen/cdnjs,cluo/cdnjs,gogoleva/cdnjs,underyx/cdnjs,viskin/cdnjs,ericelliott/cdnjs,dhenson02/cdnjs,xubowenjx/cdnjs,thesandlord/cdnjs,AlexisArce/cdnjs,ruo91/cdnjs,Flo-Schield-Bobby/cdnjs,mikelambert/cdnjs,XVicarious/cdnjs,tomsoir/cdnjs,OnsenUI/cdnjs,a8m/cdnjs,Ryuno-Ki/cdnjs,HealthIndicators/cdnjs,RizkyAdiSaputra/cdnjs,kood1/cdnjs,gereon/cdnjs,warpech/cdnjs,iros/cdnjs,ErikSchierboom/cdnjs,akiran/cdnjs,binaek89/cdnjs,a8m/cdnjs,anshulverma/cdnjs,paleozogt/cdnjs,xubowenjx/cdnjs,idleberg/cdnjs,mikelambert/cdnjs,dominicrico/cdnjs,senekis/cdnjs,artch/cdnjs,kirbyfan64/cdnjs,ankitjamuar/cdnjs,ekeneijeoma/cdnjs,FaiblUG/cdnjs,ripple0328/cdnjs,xymostech/cdnjs,lmccart/cdnjs