Fix merge conflict (#11232)

Release Notes:

- N/A
b18ca1585eConrad Irwin committed on 4/30/2024, 10:26:10 PM· committed by GitHubparent93fbca4
1 file changedLine totals unavailable