diff --git a/chart/templates/vault/gitrepository.yaml b/chart/templates/vault/gitrepository.yaml
index 8b2a911c9a75226e9e58ff39e9c0a074bf1d740a..5080999e5d77aec217a71f4c7ebabb90b6e3ae54 100644
--- a/chart/templates/vault/gitrepository.yaml
+++ b/chart/templates/vault/gitrepository.yaml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 {{- if and (not .Values.offline) .Values.addons.vault.enabled }}
-=======
-{{- if and (not .Values.offline) .Values.vault.enabled }}
->>>>>>> eb61ff0b (add vault deployment)
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
@@ -14,15 +10,9 @@ metadata:
     {{- include "commonLabels" . | nindent 4}}
 spec:
   interval: {{ .Values.flux.interval }}
-<<<<<<< HEAD
   url: {{ .Values.addons.vault.git.repo }}
   ref:
     {{- include "validRef" .Values.addons.vault.git | nindent 4 }}
-=======
-  url: {{ .Values.vault.git.repo }}
-  ref:
-    {{- include "validRef" .Values.vault.git | nindent 4 }}
->>>>>>> eb61ff0b (add vault deployment)
   {{ include "gitIgnore" . }}
   {{- include "gitCreds" . | nindent 2 }}
 {{- end }}
diff --git a/chart/templates/vault/imagepullsecret.yaml b/chart/templates/vault/imagepullsecret.yaml
index 14fb1f26975ef1da066102965dc08d989b661316..cf24c17a2636eed65b8cb7202a2ebad398f94c7f 100644
--- a/chart/templates/vault/imagepullsecret.yaml
+++ b/chart/templates/vault/imagepullsecret.yaml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 {{- if .Values.addons.vault.enabled }}
-=======
-{{- if .Values.vault.enabled }}
->>>>>>> eb61ff0b (add vault deployment)
 {{- if ( include "imagePullSecret" . ) }}
 apiVersion: v1
 kind: Secret
diff --git a/chart/templates/vault/namespace.yaml b/chart/templates/vault/namespace.yaml
index c0db24839d67e86c13e17d69519e6bb7a7a87509..6fdde08f2fa240f0e4cd673d6cd25423289aa5e1 100644
--- a/chart/templates/vault/namespace.yaml
+++ b/chart/templates/vault/namespace.yaml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 {{- if .Values.addons.vault.enabled }}
-=======
-{{- if .Values.twistlock.enabled }}
->>>>>>> eb61ff0b (add vault deployment)
 apiVersion: v1
 kind: Namespace
 metadata:
diff --git a/chart/templates/vault/twistlock-helmrelease.yaml b/chart/templates/vault/twistlock-helmrelease.yaml
deleted file mode 100644
index 14e476fc10595935352c30b82d1207dc0397f1ff..0000000000000000000000000000000000000000
--- a/chart/templates/vault/twistlock-helmrelease.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-{{- $fluxSettingsVault := merge .Values.vault.flux .Values.flux -}}
-{{- if .Values.vault.enabled }}
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: vault
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: vault
-    app.kubernetes.io/component: "sandbox"
-    {{- include "commonLabels" . | nindent 4}}
-spec:
-  targetNamespace: vault
-  chart:
-    spec:
-      chart: {{ .Values.vault.git.path }}
-      interval: 5m
-      sourceRef:
-        kind: GitRepository
-        name: vault
-        namespace: {{ .Release.Namespace }}
-
-  {{- toYaml $fluxSettingsVault | nindent 2 }}
-  
-  {{- if .Values.vault.postRenderers }}
-  postRenderers:
-  {{ toYaml .Values.vault.postRenderers | nindent 4 }}
-  {{- end }}
-  valuesFrom:
-    - name: {{ .Release.Name }}-vault-values
-      kind: Secret
-      valuesKey: "common"
-    - name: {{ .Release.Name }}-vault-values
-      kind: Secret
-      valuesKey: "defaults"
-    - name: {{ .Release.Name }}-vault-values
-      kind: Secret
-      valuesKey: "overlays"
-
-  # TODO: DRY this up
-  {{- if or .Values.gatekeeper.enabled .Values.istio.enabled }}
-  dependsOn:
-    {{- if .Values.gatekeeper.enabled }}
-    - name: gatekeeper
-      namespace: {{ .Release.Namespace }}
-    {{- end }}
-    {{- if .Values.istio.enabled }}
-    - name: istio
-      namespace: {{ .Release.Namespace }}
-    {{- end }}
-    {{- if .Values.monitoring.enabled }}
-    - name: monitoring
-      namespace: {{ .Release.Namespace }}
-    {{- end }}
-  {{- end }}
-{{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
index fde4b77714a3bf2c53262d1577a1331fa0674775..a24a1c4e85107dc301facf5171d7b49de3b352fe 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -499,7 +499,6 @@ addons:
     values: {}
     postRenderers: []
 
-# ----------------------------------------------------------------------------------------------------------------------
   argocd:
     # -- Toggle deployment of ArgoCD.
     enabled: false
@@ -564,18 +563,6 @@ addons:
     # -- Additional authservice chain configurations.
     chains: {}
 
-  # ----------------------------------------------------------------------------------------------------------------------  
-  # Vault
- #
-  vault:
-  # -- Toggle deployment of vault.
-    enabled: true
-    git:
-      repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/vault.git
-      path: "./chart"
-      branch: "deploy-vault"
-  # ----------------------------------------------------------------------------------------------------------------------  
-
   # ----------------------------------------------------------------------------------------------------------------------
   # Minio Operator and Instance
   #