made conflict disable undoable