diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index b23d596c..3340cb89 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -15,10 +15,6 @@ jobs:
     - name: npm install, build, and test
       run: |
         npm ci
-<<<<<<< HEAD:.github/workflows/nodejs.yml
-=======
-        npm run build --if-present
->>>>>>> 6599f97088dcda01d7b05abe9afc732165f0af62:.github/workflows/nodejs.yml
         npm run lint
         npm test
       env: