Correct error in merge

Refs #10277