diff --git a/.github/workflows/test-nix.yml b/.github/workflows/test-nix.yml
index 42b5eee93a5..e2ca63ae453 100644
--- a/.github/workflows/test-nix.yml
+++ b/.github/workflows/test-nix.yml
@@ -25,10 +25,17 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Install nix
+<<<<<<< HEAD
         uses: DeterminateSystems/nix-installer-action@7993355175c2765e5733dae74f3e0786fe0e5c4f # v12
 
       - name: Setup cachix
         uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
+=======
+        uses: DeterminateSystems/nix-installer-action@v12
+
+      - name: Setup cachix
+        uses: cachix/cachix-action@v15
+>>>>>>> 3986103fdf (CI: add nix package build test (#3906))
         with:
           name: osgeo-grass
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'