Resolve missed conflicts

Author: galargh

.github/workflows/hardhat-core-ci.yml

@@ -39,15 +39,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-<<<<<<< HEAD
       - uses: ./.github/actions/setup-env
-=======
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 9
-      - name: Install Node
-        uses: actions/setup-node@v4
->>>>>>> origin/main
         with:
           node-version: ${{ matrix.node }}
 
@@ -119,14 +111,7 @@ jobs:
         node: [18, 20]
     steps:
       - uses: actions/checkout@v4
-<<<<<<< HEAD
       - uses: ./.github/actions/setup-env
-=======
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 9
-      - uses: actions/setup-node@v4
->>>>>>> origin/main
         with:
           node-version: ${{ matrix.node }}
       - name: Install

.github/workflows/pre-release.yml

@@ -46,17 +46,7 @@ jobs:
         working-directory: packages/hardhat-core
     steps:
       - uses: actions/checkout@v4
-<<<<<<< HEAD
       - uses: ./.github/actions/setup-env
-=======
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 9
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          cache: "pnpm"
->>>>>>> origin/main
       - name: Install
         run: pnpm install --frozen-lockfile --prefer-offline
       - name: Cache network requests