diff --git a/argocd/bootstrap/crds/external-secrets/kustomization.yaml b/argocd/bootstrap/crds/external-secrets/kustomization.yaml
index 4f7e9f8b..5067c9bb 100644
--- a/argocd/bootstrap/crds/external-secrets/kustomization.yaml
+++ b/argocd/bootstrap/crds/external-secrets/kustomization.yaml
@@ -4,8 +4,5 @@ resources:
 # external-secrets https://github.com/external-secrets/external-secrets/tree/main/deploy/charts/external-secrets
 # helm chart version 0.9.9
 # external-secrets helm chart to be installed with value installCDRs=false
-<<<<<<< HEAD
 - https://raw.githubusercontent.com/external-secrets/external-secrets/v0.9.9/deploy/crds/bundle.yaml
-=======
-- https://raw.githubusercontent.com/external-secrets/external-secrets/v0.9.9/deploy/crds/bundle.yaml
->>>>>>> upstream/master
+