[OE-3987] transaction conflict handling