Try to solve merge conflict. Refs #10699