diff --git a/.gitignore b/.gitignore
index 667aaef..7006c04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
+<<<<<<< HEAD
+=======
+
+*.class
+=======
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382
 HELP.md
 target/
 .mvn/wrapper/maven-wrapper.jar
@@ -28,6 +34,9 @@ target/
 build/
 !**/src/main/**/build/
 !**/src/test/**/build/
+<<<<<<< HEAD
 
 ### VS Code ###
 .vscode/
+=======
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382
diff --git a/Dockerfile b/Dockerfile
index 0cab433..c81ce78 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,35 @@
+<<<<<<< HEAD
+=======
+# ─── ETAPA 1: BUILD ───────────────────────────────────────────────────────────
+FROM maven:3-eclipse-temurin-25 AS builder
+
+WORKDIR /app
+
+# Copia el pom primero para aprovechar cache de dependencias
+COPY pom.xml .
+RUN mvn dependency:go-offline -q
+
+# Copia el código fuente y compila (sin tests)
+COPY src ./src
+RUN mvn package -DskipTests -q
+
+# ─── ETAPA 2: RUNTIME ─────────────────────────────────────────────────────────
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382
 FROM eclipse-temurin:25-jdk
 
 WORKDIR /app
 
+<<<<<<< HEAD
 COPY target/*.jar app.jar
 
 EXPOSE 8080
 
-ENTRYPOINT ["java","-jar","/app/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-jar","/app/app.jar"]
+=======
+# Solo copia el .jar generado — Maven y el código fuente NO están aquí
+COPY --from=builder /app/target/*.jar app.jar
+
+EXPOSE 8080
+
+ENTRYPOINT ["java", "-jar", "app.jar"]
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382
diff --git a/README.md b/README.md
index c77a342..b94192b 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,7 @@
+<<<<<<< HEAD
 fisrt_respositories
+=======
+
+fisrt_respositories
+>>>>>>> 1b686e8 (Add initial README with repository name)
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382
diff --git a/docker-compose_prod.yml b/docker-compose_prod.yml
index 7790322..f692504 100644
--- a/docker-compose_prod.yml
+++ b/docker-compose_prod.yml
@@ -9,6 +9,16 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: ${MYSQL_ALLOW_EMPTY_PASSWORD}
     ports:
       - "3306:3306"
+<<<<<<< HEAD
+=======
+    volumes:
+      - mysql_data:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382
     restart: unless-stopped
 
   backend:
@@ -17,11 +27,23 @@ services:
       dockerfile: Dockerfile
     container_name: spring_admision
     depends_on:
+<<<<<<< HEAD
       - mysql
+=======
+      mysql:
+        condition: service_healthy
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382
     ports:
       - "8080:8080"
     environment:
       SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3306/${MYSQL_DATABASE}?useSSL=false&serverTimezone=UTC
       SPRING_DATASOURCE_USERNAME: root
       SPRING_DATASOURCE_PASSWORD: ""
-    restart: unless-stopped
\ No newline at end of file
+<<<<<<< HEAD
+    restart: unless-stopped
+=======
+    restart: unless-stopped
+
+volumes:
+  mysql_data:
+>>>>>>> a61fbdac8806abc95050ca913152695fa4386382