Fix broken merge (#25776)

Closes #ISSUE

Release Notes:

- N/A *or* Added/Fixed/Improved ...
482a45feacCole Miller committed on 2/27/2025, 8:48:14 PM· committed by GitHubparent7ec3702
1 file changedLine totals unavailable