diff --git a/.github/workflows/pr-merged.yaml b/.github/workflows/pr-merged.yaml
index 3fa83b5..fef0c51 100644
--- a/.github/workflows/pr-merged.yaml
+++ b/.github/workflows/pr-merged.yaml
@@ -15,7 +15,10 @@ jobs:
       packages: write
       pull-requests: read
       id-token: write
+<<<<<<< HEAD
       contents: read
+=======
+>>>>>>> bdd85e5a04c262aea3f358408be7df19fca6ee38
     uses: kubescape/workflows/.github/workflows/incluster-comp-pr-merged.yaml@main
     with:
       IMAGE_NAME: quay.io/${{ github.repository_owner }}/kubescape-exporter