diff --git a/.github/workflows/deploy_docs.yaml b/.github/workflows/deploy_docs.yaml
index b4a04f0..2755e5e 100644
--- a/.github/workflows/deploy_docs.yaml
+++ b/.github/workflows/deploy_docs.yaml
@@ -29,12 +29,7 @@ jobs:
       - name: Install Pixi
         uses: prefix-dev/setup-pixi@v0.5.1 
         with:
-<<<<<<< Updated upstream
           pixi-version: ${{ env.PIXI_VERSION }} 
-=======
-          pixi-version: ${{ env.PIXI_version }} 
-          frozen: true
->>>>>>> Stashed changes
           cache: true
           cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
 
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index b47af34..2017e02 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -30,6 +30,7 @@ jobs:
         with:
           pixi-version: ${{ env.PIXI_version }} 
           cache: true
+          cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
 
       - name: Install repository
         run: |