fix some warnings and merge errors

f90b693ed5K Simmons committed on 10/9/2022, 6:49:04 AMparent515c1ea
2 files changedLine totals unavailable