Fix some merge errors

9581279919Marshall Bowers committed on 10/12/2023, 2:27:50 PMparent002458f
2 files changedLine totals unavailable