diff --git a/docker-compose.yml b/docker-compose.yml
index 1d558f9..1649814 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,9 +7,6 @@ services:
     ports:
       - "2000:80"
     volumes:
-<<<<<<< Updated upstream
-      - /srv/arenos-landing/html:/srv:ro
-=======
-      - /srv/arenos_www/html:/srv:ro
->>>>>>> Stashed changes
+    - /srv/arenos_www/html:/srv:ro
+
     command: ["caddy","file-server","--root","/srv","--listen",":80"]
\ No newline at end of file