Fix merge conflict

b801e0a46eConrad Irwin committed on 1/9/2024, 4:44:22 PMparentbebb528
1 file changedLine totals unavailable