Fix a badly merged conflict
Fix a badly merged conflict

* origin/pr/12056:
  Fix a badly merged conflict