namespace correction for vault

chart/templates/vault/namespace.yaml

-<<<<<<< HEAD
 {{- if .Values.addons.vault.enabled }}
-=======
-{{- if .Values.twistlock.enabled }}
->>>>>>> b3d915d2 (add vault deployment)
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -12,8 +8,4 @@ metadata:
     app.kubernetes.io/component: "sandbox"
     {{- include "commonLabels" . | nindent 4}}
     istio-injection: enabled
-<<<<<<< HEAD
-{{- end }}
-=======
-{{- end }}
->>>>>>> b3d915d2 (add vault deployment)
+{{- end }}
\ No newline at end of file