diff --git a/docker-compose.yml b/docker-compose.yml
index afe42cc..eaa63bd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,11 +20,5 @@ services:
       RAM_SIZE: "2G"   # Mínimo recomendado para Win11
       CPU_CORES: "2"   # Quantidade de núcleos
       DISK_SIZE: "15G" # Tamanho do disco virtual
-=======
-      VERSION: "7u"
-      RAM_SIZE: "2G"
-      CPU_CORES: "2"
-      DISK_SIZE: "10G"
->>>>>>> 5873deb52aa21b9e86404a4df3f915901e2aba71
       USERNAME: "admin"
       PASSWORD: "admin"