Fix unresolved merge conflicts.

Refs #9059