Resolve conflicts. Refs #6965