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