fix merge conflicts

partially reapply b636d56d6a71b9ed521de7fccb519b7d0fa3db90
31e0b5c3c7Andrew Kelley committed on 7/1/2025, 11:35:26 PMparent57e1fc2
1 file changedLine totals unavailable