Need to update the type annotations for this and for `deleteConflicts`