Fix unresolved merge issue.
Fix unresolved merge issue.

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