Fix errors resulting from rebase

5cb59dfdabIsaac Clayton committed on 7/7/2022, 4:14:16 PMparenta16fc2b
6 files changedLine totals unavailable