Refs #3270: merge error