Fix merge conflict (#41853)

Closes #ISSUE

Release Notes:

- N/A
d075a56ee7Conrad Irwin committed on 11/3/2025, 8:41:39 PM· committed by GitHubparent8217e57
8 files changedLine totals unavailable