Fix class/interface merging issue + lint error
Fix class/interface merging issue + lint error

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