Fix bad merge conflict resolution

Refs #9843