diff --git a/.github/workflows/acceptance.yaml b/.github/workflows/acceptance.yaml
index 84e8e4ce5..648616b35 100644
--- a/.github/workflows/acceptance.yaml
+++ b/.github/workflows/acceptance.yaml
@@ -7,11 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-<<<<<<< HEAD
         kind-k8s-version: [1.16.15, 1.20.15, 1.21.14, 1.22.15, 1.23.12, 1.24.6, 1.25.3]
-=======
-        kind-k8s-version: [1.16.15, 1.20.15, 1.21.10, 1.22.7, 1.23.4]
->>>>>>> c575574 (feat(DATAGO-30305): Upgrade vault server to 1.10.x (#16))
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
diff --git a/values.yaml b/values.yaml
index 5c6753d76..eed1fcfce 100644
--- a/values.yaml
+++ b/values.yaml
@@ -186,7 +186,7 @@ injector:
   # Deprecated: please use 'webhook.annotations' instead
   # Extra annotations to attach to the webhook
   webhookAnnotations: {}
-
+  
   certs:
     # secretName is the name of the secret that has the TLS certificate and
     # private key to serve the injector webhook. If this is null, then the
@@ -292,7 +292,6 @@ injector:
   serviceAccount:
     # Extra annotations to attach to the injector serviceAccount
     annotations: {}
-
   # A disruption budget limits the number of pods of a replicated application
   # that are down simultaneously from voluntary disruptions
   podDisruptionBudget: {}