diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 06bac2c..bf42237 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -32,14 +32,11 @@ services:
       - NODE_ENV=development
       - PUBLIC_ALLOWED_HOSTS=serviseri-004.captain.mitteworkspace.cloud
       - PUBLIC_HMR_HOST=serviseri-004.captain.mitteworkspace.cloud
-<<<<<<< HEAD
       - PUBLIC_HMR_PROTOCOL=ws
       - PUBLIC_HMR_CLIENT_PORT=4321
-=======
       - PUBLIC_HMR_PROTOCOL=wss
       - PUBLIC_HMR_CLIENT_PORT=443
       - PUBLIC_API_URL=https://api-004.captain.mitteworkspace.cloud/api/
->>>>>>> ea28748 (WIP: local production settings updates)
   
   flower:
     container_name: 004erpflower