Cleaned codes. Refs #8291.
Resolved the conflict. Refs #8291.