refs #567, fix some missed conflicts