Better merge

Refs #1700