Remove merge conflict marker
Remove merge conflict marker

minodisk/DefinitelyTyped,benliddicott/DefinitelyTyped,alvarorahul/DefinitelyTyped,use-strict/DefinitelyTyped,zuzusik/DefinitelyTyped,isman-usoh/DefinitelyTyped,psnider/DefinitelyTyped,GiedriusGrabauskas/DefinitelyTyped,dsebastien/DefinitelyTyped,rolandzwaga/DefinitelyTyped,alexdresko/DefinitelyTyped,QuatroCode/DefinitelyTyped,AbraaoAlves/DefinitelyTyped,AgentME/DefinitelyTyped,shlomiassaf/DefinitelyTyped,borisyankov/DefinitelyTyped,AbraaoAlves/DefinitelyTyped,one-pieces/DefinitelyTyped,borisyankov/DefinitelyTyped,georgemarshall/DefinitelyTyped,psnider/DefinitelyTyped,johan-gorter/DefinitelyTyped,dsebastien/DefinitelyTyped,martinduparc/DefinitelyTyped,smrq/DefinitelyTyped,magny/DefinitelyTyped,sledorze/DefinitelyTyped,rolandzwaga/DefinitelyTyped,arusakov/DefinitelyTyped,micurs/DefinitelyTyped,alexdresko/DefinitelyTyped,mcrawshaw/DefinitelyTyped,QuatroCode/DefinitelyTyped,nycdotnet/DefinitelyTyped,chrootsu/DefinitelyTyped,amir-arad/DefinitelyTyped,markogresak/DefinitelyTyped,AbraaoAlves/DefinitelyTyped,shlomiassaf/DefinitelyTyped,ashwinr/DefinitelyTyped,zuzusik/DefinitelyTyped,AgentME/DefinitelyTyped,benishouga/DefinitelyTyped,martinduparc/DefinitelyTyped,psnider/DefinitelyTyped,scriby/DefinitelyTyped,arusakov/DefinitelyTyped,benishouga/DefinitelyTyped,scriby/DefinitelyTyped,martinduparc/DefinitelyTyped,johan-gorter/DefinitelyTyped,abbasmhd/DefinitelyTyped,mcrawshaw/DefinitelyTyped,aciccarello/DefinitelyTyped,alvarorahul/DefinitelyTyped,abbasmhd/DefinitelyTyped,jimthedev/DefinitelyTyped,jimthedev/DefinitelyTyped,zuzusik/DefinitelyTyped,chrismbarr/DefinitelyTyped,nycdotnet/DefinitelyTyped,sledorze/DefinitelyTyped,jimthedev/DefinitelyTyped,georgemarshall/DefinitelyTyped,benishouga/DefinitelyTyped,magny/DefinitelyTyped,progre/DefinitelyTyped,YousefED/DefinitelyTyped,arusakov/DefinitelyTyped,isman-usoh/DefinitelyTyped,progre/DefinitelyTyped,georgemarshall/DefinitelyTyped,mcliment/DefinitelyTyped,minodisk/DefinitelyTyped,use-strict/DefinitelyTyped,laurentiustamate94/DefinitelyTyped,GiedriusGrabauskas/DefinitelyTyped,AgentME/DefinitelyTyped,chrootsu/DefinitelyTyped,AgentME/DefinitelyTyped,chrismbarr/DefinitelyTyped,ashwinr/DefinitelyTyped,YousefED/DefinitelyTyped,aciccarello/DefinitelyTyped,smrq/DefinitelyTyped,georgemarshall/DefinitelyTyped,aciccarello/DefinitelyTyped