diff --git a/.github/workflows/_build_publish.yaml b/.github/workflows/_build_publish.yaml
index f135e267c721..6e3c7d448e63 100644
--- a/.github/workflows/_build_publish.yaml
+++ b/.github/workflows/_build_publish.yaml
@@ -54,7 +54,11 @@ jobs:
       - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
           go-version-file: go.mod
+<<<<<<< HEAD
       - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+=======
+      - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+>>>>>>> ef8eb9fce (chore(deps): upgrade actions/cache from v4.1.0 to v4.2.0 (#12485))
         with:
           path: |
             ${{ env.CI_TOOLS_DIR }}
@@ -105,7 +109,11 @@ jobs:
       - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
           go-version-file: go.mod
+<<<<<<< HEAD
       - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+=======
+      - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+>>>>>>> ef8eb9fce (chore(deps): upgrade actions/cache from v4.1.0 to v4.2.0 (#12485))
         with:
           path: |
             ${{ env.CI_TOOLS_DIR }}
@@ -227,7 +235,11 @@ jobs:
           go-version-file: go.mod
           cache-dependency-path: |
             go.sum
+<<<<<<< HEAD
       - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+=======
+      - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+>>>>>>> ef8eb9fce (chore(deps): upgrade actions/cache from v4.1.0 to v4.2.0 (#12485))
         with:
           path: |
             ${{ env.CI_TOOLS_DIR }}
diff --git a/.github/workflows/_e2e.yaml b/.github/workflows/_e2e.yaml
index 00ae9fc90a5b..3c454f26de62 100644
--- a/.github/workflows/_e2e.yaml
+++ b/.github/workflows/_e2e.yaml
@@ -33,7 +33,11 @@ jobs:
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version-file: go.mod
+<<<<<<< HEAD
       - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+=======
+      - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+>>>>>>> ef8eb9fce (chore(deps): upgrade actions/cache from v4.1.0 to v4.2.0 (#12485))
         with:
           path: |
             ${{ env.CI_TOOLS_DIR }}
diff --git a/.github/workflows/_test.yaml b/.github/workflows/_test.yaml
index fd85ef72b951..94f95ec91e6f 100644
--- a/.github/workflows/_test.yaml
+++ b/.github/workflows/_test.yaml
@@ -26,7 +26,11 @@ jobs:
       - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
           go-version-file: go.mod
+<<<<<<< HEAD
       - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+=======
+      - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+>>>>>>> ef8eb9fce (chore(deps): upgrade actions/cache from v4.1.0 to v4.2.0 (#12485))
         with:
           path: |
             ${{ env.CI_TOOLS_DIR }}
diff --git a/.github/workflows/build-test-distribute.yaml b/.github/workflows/build-test-distribute.yaml
index f6e8b4994e6f..5971951d0d0f 100644
--- a/.github/workflows/build-test-distribute.yaml
+++ b/.github/workflows/build-test-distribute.yaml
@@ -52,8 +52,13 @@ jobs:
       - uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
         with:
           args: --fix=false --verbose
+<<<<<<< HEAD
           version: v1.59.0
       - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+=======
+          version: v1.60.3
+      - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+>>>>>>> ef8eb9fce (chore(deps): upgrade actions/cache from v4.1.0 to v4.2.0 (#12485))
         with:
           path: |
             ${{ env.CI_TOOLS_DIR }}
diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml
index 4c19c03967f9..19128b407c68 100644
--- a/.github/workflows/helm-release.yaml
+++ b/.github/workflows/helm-release.yaml
@@ -34,7 +34,11 @@ jobs:
       - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
           go-version-file: go.mod
+<<<<<<< HEAD
       - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+=======
+      - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+>>>>>>> ef8eb9fce (chore(deps): upgrade actions/cache from v4.1.0 to v4.2.0 (#12485))
         with:
           path: |
             ${{ env.CI_TOOLS_DIR }}
diff --git a/.github/workflows/pr-comments.yaml b/.github/workflows/pr-comments.yaml
index 2fbf4d0ddca3..cd66b883657c 100644
--- a/.github/workflows/pr-comments.yaml
+++ b/.github/workflows/pr-comments.yaml
@@ -47,7 +47,11 @@ jobs:
       - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
           go-version-file: go.mod
+<<<<<<< HEAD
       - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+=======
+      - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+>>>>>>> ef8eb9fce (chore(deps): upgrade actions/cache from v4.1.0 to v4.2.0 (#12485))
         with:
           path: |
             ${{ env.CI_TOOLS_DIR }}
diff --git a/.github/workflows/transparentproxy-tests.yaml b/.github/workflows/transparentproxy-tests.yaml
index 0853d55ca6c2..3f103155372a 100644
--- a/.github/workflows/transparentproxy-tests.yaml
+++ b/.github/workflows/transparentproxy-tests.yaml
@@ -19,7 +19,11 @@ jobs:
       - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
           go-version-file: go.mod
+<<<<<<< HEAD
       - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+=======
+      - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+>>>>>>> ef8eb9fce (chore(deps): upgrade actions/cache from v4.1.0 to v4.2.0 (#12485))
         with:
           path: |
             ${{ env.CI_TOOLS_DIR }}