@@ -27,11 +27,7 @@ jobs:
           version: "3.11"
 
       - name: Download distributions
-<<<<<<< before updating
-        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333  # v8
-=======
         uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333  # v8.0.2
->>>>>>> after updating
         with:
           pattern: dist-ubuntu-24.04-3.11
           merge-multiple: true