diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index 154d7da..2e99cdc 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -25,8 +25,4 @@ jobs:
       - name: Install dependencies
         run: pnpm install
       - name: Run Test
-<<<<<<< HEAD
         run: pnpm test
-=======
-        run: pnpm test
->>>>>>> 68115cbd4e641702d544029a12dec066d2ad91be