fix merge conflicts

98b932cfabAndrew Kelley committed on 3/23/2022, 3:17:43 AMparentbe1cca3
1 file changedLine totals unavailable