Fix mistake in merge conflict resolution.

Refs #8640