delete the conflictw