Resolved transaction conflicts