Fix conflicts in go.mod and go.sum

go.mod

@@ -45,21 +45,12 @@ require (
 	google.golang.org/api v0.139.0
 	google.golang.org/protobuf v1.31.0
 	gopkg.in/yaml.v2 v2.4.0
-<<<<<<< HEAD
-	k8s.io/api v0.25.0
-	k8s.io/apiextensions-apiserver v0.25.0
-	k8s.io/apimachinery v0.25.16
-	k8s.io/client-go v0.25.0
-	k8s.io/code-generator v0.25.0
-	k8s.io/gengo v0.0.0-20211129171323-c02415ce4185
-=======
 	k8s.io/api v0.27.2
 	k8s.io/apiextensions-apiserver v0.27.2
 	k8s.io/apimachinery v0.27.2
 	k8s.io/client-go v0.27.2
 	k8s.io/code-generator v0.27.2
 	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d
->>>>>>> a0bd7ff78 (upgrade kdp part 1)
 	k8s.io/klog/v2 v2.100.1
 	sigs.k8s.io/controller-runtime v0.15.2
 	sigs.k8s.io/controller-tools v0.6.2