refs #1544 : bugfix - conflict error.