Fixed some errors in resolving conflict. Refs #8291.