diff --git a/charts/argo-ci/values.yaml b/charts/argo-ci/values.yaml
index 151ea1f7..848eb698 100644
--- a/charts/argo-ci/values.yaml
+++ b/charts/argo-ci/values.yaml
@@ -9,4 +9,8 @@ argo:
   installMinio: true
   minioBucketName: argo-artifacts
   useReleaseAsInstanceID: true
+<<<<<<< HEAD
   
+=======
+  
+>>>>>>> changes on circleci to