resolve merge conflicts

with 497592c9b45a94fb7b6028bf45b80f183e395a9b
eb943890d9Andrew Kelley committed on 1/15/2025, 11:11:36 PMparentaebccb0
3 files changedLine totals unavailable