refs #851 Bad at merging