fix rebase merge error

a190eb0537Keith Simmons committed on 6/24/2022, 10:11:57 PMparent92ab107
1 file changedLine totals unavailable