diff --git a/Docker/semaphore-ui/docker-compose.yml b/Docker/semaphore-ui/docker-compose.yml
index a5acffc..97d26b4 100644
--- a/Docker/semaphore-ui/docker-compose.yml
+++ b/Docker/semaphore-ui/docker-compose.yml
@@ -9,18 +9,9 @@ services:
             SEMAPHORE_ADMIN_PASSWORD: ${ADMIN_PASS}
             SEMAPHORE_ADMIN_NAME: ${ADMIN_NAME}
             SEMAPHORE_ADMIN_EMAIL: ${ADMIN_EMAIL}
-<<<<<<< HEAD
         volumes:       
             - semaphore-data:/var/lib/semaphore
             - semaphore-config:/etc/semaphore  
 volumes:
   semaphore-data:
   semaphore-config:
-=======
-        volumes:
-            - /home/mbuz/docker/semaphore/data:/var/lib/semaphore
-            - /home/mbuz/docker/semaphore/config:/etc/semaphore
-volumes:
-    /home/mbuz/docker/semaphore/data:
-    /home/mbuz/docker/semaphore/config:
->>>>>>> 24861aa (ADD: Semaphore UI initial commit)