diff --git a/.forgejo/Workflows/deploy.yml b/.forgejo/Workflows/deploy.yml
index 8d65527..35a5fc3 100644
--- a/.forgejo/Workflows/deploy.yml
+++ b/.forgejo/Workflows/deploy.yml
@@ -17,9 +17,5 @@ jobs:
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           script: |
             ls
-<<<<<<< HEAD
-            cd homeserver
-=======
             cd Homepage
->>>>>>> c3ec9d31ec63e14c87b6b980b9864ff21dc3690b
             ${{ secrets.SCRIPT }}