TypeScriptStandalone
Merged conflict
minor comment, only