Handle "conflicted" transactions properly