chore: resolve conflicts

Author: lumirlumir

.github/workflows/analyze.yml

@@ -57,11 +57,7 @@ jobs:
           name: bundle_analysis.json
 
       - name: Download base branch bundle stats
-<<<<<<< HEAD
-        uses: dawidd6/action-download-artifact@v4
-=======
         uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e
->>>>>>> f6d762cbbf958ca45bb8d1d011b31e5289e43a3d
         if: success() && github.event.number
         with:
           workflow: analyze.yml