check for ResourceVersion conflict in separate if block
check for ResourceVersion conflict in separate if block

Kubernetes-commit: 42f0a36f44bac33f4230fdea9f3dcc4bfb645a0a

kubernetes/apiextensions-apiserver,kubernetes/apiextensions-apiserver