undo user conflict