resolve confilict
resolve confilict

Eyas/TypeScript,kpreisser/TypeScript,minestarks/TypeScript,donaldpipowitch/TypeScript,kitsonk/TypeScript,microsoft/TypeScript,erikmcc/TypeScript,basarat/TypeScript,TukekeSoft/TypeScript,synaptek/TypeScript,donaldpipowitch/TypeScript,minestarks/TypeScript,SaschaNaz/TypeScript,alexeagle/TypeScript,synaptek/TypeScript,alexeagle/TypeScript,SaschaNaz/TypeScript,thr0w/Thr0wScript,DLehenbauer/TypeScript,chuckjaz/TypeScript,nojvek/TypeScript,weswigham/TypeScript,Microsoft/TypeScript,RyanCavanaugh/TypeScript,thr0w/Thr0wScript,alexeagle/TypeScript,DLehenbauer/TypeScript,kpreisser/TypeScript,kpreisser/TypeScript,RyanCavanaugh/TypeScript,mihailik/TypeScript,TukekeSoft/TypeScript,kitsonk/TypeScript,SaschaNaz/TypeScript,basarat/TypeScript,jwbay/TypeScript,mihailik/TypeScript,DLehenbauer/TypeScript,erikmcc/TypeScript,SaschaNaz/TypeScript,donaldpipowitch/TypeScript,microsoft/TypeScript,basarat/TypeScript,mihailik/TypeScript,erikmcc/TypeScript,basarat/TypeScript,mihailik/TypeScript,kitsonk/TypeScript,minestarks/TypeScript,Eyas/TypeScript,Eyas/TypeScript,nojvek/TypeScript,jwbay/TypeScript,Microsoft/TypeScript,chuckjaz/TypeScript,microsoft/TypeScript,RyanCavanaugh/TypeScript,Eyas/TypeScript,chuckjaz/TypeScript,donaldpipowitch/TypeScript,weswigham/TypeScript,DLehenbauer/TypeScript,thr0w/Thr0wScript,jwbay/TypeScript,thr0w/Thr0wScript,erikmcc/TypeScript,jwbay/TypeScript,synaptek/TypeScript,nojvek/TypeScript,synaptek/TypeScript,TukekeSoft/TypeScript,nojvek/TypeScript,chuckjaz/TypeScript,Microsoft/TypeScript,weswigham/TypeScript