Fix new errors after merge

c118f9aabdJoseph Lyons committed on 1/23/2023, 6:31:02 AMparentf2a5a4d
5 files changedLine totals unavailable