(refs #2)Add conflict checking.