* fix: attempt to optimize concurrency queries

* fix: on conflict + retry handling

* fix: check retry count later