Retry on conflict error