row
row_resolve_conflict