Refs #9358. Fixed an error during resolving conflicts.