Fixed conflict. refs #437