diff --git a/.gitea/workflows/test-build.yaml b/.gitea/workflows/test-build.yaml
index a28765f..53c5f61 100644
--- a/.gitea/workflows/test-build.yaml
+++ b/.gitea/workflows/test-build.yaml
@@ -24,11 +24,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v6
         with:
-<<<<<<< HEAD
-          node-version: 22.20.0
-=======
           node-version: 24.10.0
->>>>>>> c828e57 (update image)
           cache: pnpm
 
       - name: Install Dependencies