diff --git a/docs/workflow-controller-configmap.yaml b/docs/workflow-controller-configmap.yaml
index 41b0047ebf89..71885aabed3a 100644
--- a/docs/workflow-controller-configmap.yaml
+++ b/docs/workflow-controller-configmap.yaml
@@ -202,6 +202,7 @@ data:
       #   passwordSecret:
       #     name: argo-mysql-config
       #     key: password
+<<<<<<< HEAD
 
     # Default values that will apply to all Workflows from this controller, unless overridden on the Workflow-level
     # See more: docs/default-workflow-specs.md
@@ -251,3 +252,11 @@ data:
     #     Workflow cannot run an arbitrary Workflow, use this option.
     workflowRequirements:
       referenceOnly: true
+=======
+      
+    # default values workflow spec, follow the workflow spec more info: https://github.com/argoproj/argo/blob/master/examples/README.md#the-structure-of-workflow-specs
+    workflowDefaults:
+      # example
+      ttlStrategy:
+        secondsAfterCompletion: 10
+>>>>>>> 788e73ec... Update workflow-controller-configmap.yaml