fix merge conflicts and test cases

44f9061b71Andrew Kelley committed on 3/22/2022, 10:58:19 PMparent60d8c47
2 files changedLine totals unavailable