Fix semantic merge conflict (#45078)

Release Notes:

- N/A *or* Added/Fixed/Improved ...
edcde6d90cLukas Wirth committed on 12/17/2025, 8:28:59 AM· committed by GitHubparent280864e
1 file changedLine totals unavailable