Fix conflict state (was broken by merge conflict) (#25354)

Closes #ISSUE

Release Notes:

- N/A
6516249302Conrad Irwin committed on 2/24/2025, 5:52:42 PM· committed by GitHubparentfc8218d
1 file changedLine totals unavailable