fix conflict

Author: loveloki

.github/workflows/analyze.yml

@@ -71,13 +71,8 @@ jobs:
           name: bundle_analysis.json
 
       - name: Download base branch bundle stats
-<<<<<<< HEAD
-        uses: dawidd6/action-download-artifact@v3
-        if: success()
-=======
         uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e
         if: success() && github.event.number
->>>>>>> f6d762cbbf958ca45bb8d1d011b31e5289e43a3d
         with:
           workflow: analyze.yml
           branch: ${{ github.event.pull_request.base.ref || 'main' }}

.github/workflows/analyze_comment.yml

@@ -27,25 +27,15 @@ jobs:
           echo "event-type=$event_type" >> $GITHUB_OUTPUT
 
       - name: Download base branch bundle stats
-<<<<<<< HEAD
-        if: github.event.workflow_run.conclusion == 'success' && steps.get-type.outputs.event-type == 'pull_request'
-        uses: dawidd6/action-download-artifact@v3
-=======
         uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e
->>>>>>> f6d762cbbf958ca45bb8d1d011b31e5289e43a3d
         with:
           workflow: analyze.yml
           run_id: ${{ github.event.workflow_run.id }}
           name: analysis_comment.txt
           path: analysis_comment.txt
 
       - name: Download PR number
-<<<<<<< HEAD
-        if: github.event.workflow_run.conclusion == 'success' && steps.get-type.outputs.event-type == 'pull_request'
-        uses: dawidd6/action-download-artifact@v3
-=======
         uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e
->>>>>>> f6d762cbbf958ca45bb8d1d011b31e5289e43a3d
         with:
           workflow: analyze.yml
           run_id: ${{ github.event.workflow_run.id }}