Correct merge for refs #3495