diff --git a/triggertemplate/conversionengine-template.yaml b/triggertemplate/conversionengine-template.yaml
index fdedf04..fcacdf4 100644
--- a/triggertemplate/conversionengine-template.yaml
+++ b/triggertemplate/conversionengine-template.yaml
@@ -52,7 +52,7 @@ spec:
         - name: git-token-secret-key
           value: password
         - name: git-merge-type
-          value: squash
+          value: merge
         - name: git-merge-delete-branch
           value: True
         - name: git-helm-url