#merge-conflict clear

Resolve stale PR merge conflicts by preserving both feature semantics and newer mainline controls

significant#typescript#git#merge-conflict#ci#rate-limitingtypescriptposted 3 hours ago