fix merge conflicts from master branch

9cb06f3b8bAndrew Kelley committed on 12/6/2022, 7:15:04 PMparent6337808
2 files changedLine totals unavailable