Merge "Avoid referenced before assignment in retry_on_conflict"