diff --git a/docker-compose.yml b/docker-compose.yml
index a36276c..ce1f287 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,7 @@ services:
             - driver: nvidia
               count: 1
               capabilities: [gpu]
->>>>>>> 79bb253 (docker changes)
+
   tinymixtral_local_gpu:
     profiles: ["local","gpu"]
     build: .