deleting conflict