Add ability to retry on conflict during upsert, both bulk and regular