diff --git a/docker-compose.yml b/docker-compose.yml
index 51bc775..5ea8549 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,10 +22,7 @@ services:
       retries: 3
       start_period: 40s
 
-<<<<<<< HEAD
-=======
   # --- SLMM (Sound Level Meter Manager) ---
->>>>>>> 0c2186f5d89d948b0357d674c0773a67a67d8027
   slmm:
     build:
       context: ../slmm