diff --git a/docker-compose.yml b/docker-compose.yml
index 621a9059..5e026a85 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
->>>>>>> origin/001-add-dokploy-deploy
 version: "3.8"
 
 services: