merge

Author: timea-solid

.github/workflows/ci.yml

@@ -26,15 +26,9 @@ jobs:
           - 22.x
 
     steps:
-<<<<<<< HEAD
-      - uses: actions/checkout@v4
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
-=======
       - uses: actions/checkout@v5
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v5
->>>>>>> main
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm ci