Conflicts. Refs #6965