Fix bad merge conflict. re #10281