SKIP UPGRADE Blloyd argocd cypress fix

Closes https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd/-/issues/17

tests/test-values.yaml

@@ -368,8 +368,7 @@ twistlock:
 # Addons are toggled based on labels in CI
 addons:
   argocd:
-<<<<<<< HEAD:tests/test-values.yaml
-    enabled: false
+    enabled: true
     sso:
       enabled: false
       client_id: platform1_a8604cc9-f5e9-4656-802d-d05624370245_bb8-argocd
@@ -377,9 +376,6 @@ addons:
       provider_name: "P1 SSO"
       groups: |
         g, Impact Level 2 Authorized, role:admin
-=======
-    enabled: true
->>>>>>> 0a040d8e... Enable the argocd cypress test:tests/ci/k3d/values.yaml
     values:
       controller:
         resources: