Moving to a transaction merger mode based on blocking collection.
Hopefully this will resolve the dead lock in this scenario