diff --git a/docker-compose.yml b/docker-compose.yml
index f6c926a..8b62140 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,18 +1,10 @@
 services:
-<<<<<<< HEAD
 
   streamvault:
 
     build: .
 
-    ports:
-      - "8087:8000"
-
-=======
-  streamvault:
-    image: enrilinux/streamvault:latest
     ports:
       - 8087:8000
->>>>>>> b2d0c6e (second commit)
     volumes:
       - ./downloads:/app/downloads