diff --git a/.gitea/workflows/on_docserver.yaml b/.gitea/workflows/on_docserver.yaml
index a356a73..bdca221 100644
--- a/.gitea/workflows/on_docserver.yaml
+++ b/.gitea/workflows/on_docserver.yaml
@@ -57,9 +57,15 @@ jobs:
         run: |
           source "${CARGO_HOME}/env"
           while true; do sleep 20; done
+<<<<<<< HEAD
           #cd ${{ gitea.workspace }}          
           #cargo build
           #ls -l target/debug
+=======
+          cd ${{ gitea.workspace }}          
+          cargo build
+          ls -l target/debug
+>>>>>>> 45468ec (chore: fix workflow)
       - name: Install kubectl
         run: |
           OS="$(uname | tr '[:upper:]' '[:lower:]')"