Fix a badly merged conflict

Closes #12055 

(sorry!)