diff --git a/.woodpecker/helm.yml b/.woodpecker/helm.yml
index 15420c87a2d..d6f8f2fddd2 100644
--- a/.woodpecker/helm.yml
+++ b/.woodpecker/helm.yml
@@ -16,7 +16,14 @@ pipeline:
       - cat charts/woodpecker-agent/Chart.yaml
       - cat charts/woodpecker-server/Chart.yaml
     when:
+<<<<<<< HEAD
       path: *when_path
+=======
+      path:
+        include:
+          - "charts/**"
+          - ".woodpecker/helm.yml"
+>>>>>>> 0bc9f79f (tmp)
 
   lint:
     image: alpine/helm:3.5.3
@@ -24,7 +31,14 @@ pipeline:
       - helm lint charts/woodpecker-agent/
       - helm lint charts/woodpecker-server/
     when:
+<<<<<<< HEAD
       path: *when_path
+=======
+      path:
+        include:
+          - "charts/**"
+          - ".woodpecker/helm.yml"
+>>>>>>> 0bc9f79f (tmp)
 
   release:
     image: quay.io/helmpack/chart-releaser:v1.4.0
@@ -42,4 +56,11 @@ pipeline:
       - cd woodpecker-ci.github.io/ && cr index --owner woodpecker-ci --git-repo woodpecker-ci.github.io --pages-branch master --package-path ../.cr-release-packages --index-path ../.cr-index/index.yaml --charts-repo https://woodpecker-ci.org --push --release-name-template "helm-{{ .Name }}-{{ .Version }}"
     when:
       event: tag
+<<<<<<< HEAD
       path: *when_path
+=======
+      path:
+        include:
+          - "charts/**"
+          - ".woodpecker/helm.yml"
+>>>>>>> 0bc9f79f (tmp)