* Fixing conflict resolution in transaction management code path for auto commit code path * Addressing comments * Fixing test failures
* Fixing conflict resolution in transaction management code path for auto commit code path * Addressing comments * Fixing test failures