make generate after rebase

Author: edmondceausu

config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanetemplates.yaml

@@ -73,10 +73,11 @@ spec:
                               default: overwrite
                               description: |-
                                 ConflictResolution is used to declare what should happen if there
-                                are parameter conflicts. Defaults to none
+                                are parameter conflicts. Defaults to overwrite
                               enum:
                               - overwrite
                               - none
+                              - preserve
                               type: string
                             name:
                               description: Name is the name of the addon