diff --git a/semaphore-ui/docker-compose.yml b/semaphore-ui/docker-compose.yml
index 01d51d4..a5acffc 100644
--- a/semaphore-ui/docker-compose.yml
+++ b/semaphore-ui/docker-compose.yml
@@ -9,9 +9,18 @@ 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:
\ No newline at end of file
+  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)