Fix merge conflicts

a441e1ef40Anthony committed on 11/25/2025, 7:30:26 PMparentsfc8cc6883f0a3f
64 files changedLine totals unavailable