diff --git a/docker-compose.yml b/docker-compose.yml
index 1744ba8..fbdd6a9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,6 @@
 version: '3'
 services:
+
   api:
     build: .
     ports:
@@ -8,8 +9,4 @@ services:
       - .:/app
     env_file:
       - .env
-<<<<<<< HEAD
     restart: on-failure
-=======
-    restart: on-failure
->>>>>>> 726a9f37c180e1133236d65c47932deaa201ba2b