diff --git a/.gitea/workflows/build_ci.yml b/.gitea/workflows/build_ci.yml
index 57406c8..ede6f8b 100644
--- a/.gitea/workflows/build_ci.yml
+++ b/.gitea/workflows/build_ci.yml
@@ -22,12 +22,8 @@ jobs:
 
       - name: Install nodejs and dnsutils (dig)for github action
         run:  |
-<<<<<<< HEAD
           apt-get update
           apt-get -y install nodejs dnsutils
-=======
-          apt-get -y install nodejs
->>>>>>> 9b6976d7582d7d097f31af36c02e562ef82ea903
 
       - name: Git clone private repo 
         uses: actions/checkout@v4