diff --git a/charts/argo-ci/values.yaml b/charts/argo-ci/values.yaml
index 848eb698..092b182e 100644
--- a/charts/argo-ci/values.yaml
+++ b/charts/argo-ci/values.yaml
@@ -9,8 +9,4 @@ argo:
   installMinio: true
   minioBucketName: argo-artifacts
   useReleaseAsInstanceID: true
-<<<<<<< HEAD
-  
-=======
-  
->>>>>>> changes on circleci to
+  
\ No newline at end of file