Fix semantic merge conflict (#20119)
Fix semantic merge conflict (#20119)


minestarks/TypeScript,kpreisser/TypeScript,nojvek/TypeScript,microsoft/TypeScript,RyanCavanaugh/TypeScript,basarat/TypeScript,donaldpipowitch/TypeScript,kitsonk/TypeScript,kpreisser/TypeScript,alexeagle/TypeScript,basarat/TypeScript,nojvek/TypeScript,alexeagle/TypeScript,weswigham/TypeScript,weswigham/TypeScript,nojvek/TypeScript,SaschaNaz/TypeScript,SaschaNaz/TypeScript,basarat/TypeScript,kitsonk/TypeScript,microsoft/TypeScript,microsoft/TypeScript,alexeagle/TypeScript,donaldpipowitch/TypeScript,kitsonk/TypeScript,SaschaNaz/TypeScript,Microsoft/TypeScript,weswigham/TypeScript,SaschaNaz/TypeScript,RyanCavanaugh/TypeScript,minestarks/TypeScript,Microsoft/TypeScript,kpreisser/TypeScript,donaldpipowitch/TypeScript,minestarks/TypeScript,basarat/TypeScript,nojvek/TypeScript,donaldpipowitch/TypeScript,RyanCavanaugh/TypeScript,Microsoft/TypeScript