Forgot to save one file

Author: bmonkman

templates/commit0/commit0.tmpl

@@ -13,14 +13,10 @@ infrastructure:
     region: us-east-1
     eks:
       clusterName: staging
-<<<<<<< HEAD
-      deploy: true
     cognito:
-      deploy: true
+      enabled: true
     s3_hosting:
-      deploy: true
-=======
->>>>>>> Various fixes to applying kube tf and added flags
+      enabled: true
 
 frontend:
   framework: {{.FrontendFramework}}