diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index e53064d..994daee 100755
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -26,10 +26,6 @@ jobs:
             cd ${{ secrets.PROJECT_PATH }} &&
             git pull origin main &&
             docker-compose down --remove-orphans &&
-<<<<<<< HEAD
             sleep 3 &&
-=======
-	        sleep 3 &&
->>>>>>> ebdc08a921273e8a46bcf5fcf9a727dc832aa7d3
             docker-compose up -d --build
           "