diff --git a/Dockerfile b/Dockerfile
index 78395868f..65076f65d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,4 +11,8 @@ COPY target/spring-petclinic-3.3.0-SNAPSHOT.jar .
 EXPOSE 8888
 
 # Set the entry point to run the JAR file
-ENTRYPOINT ["java", "-jar", "spring-petclinic-3.3.0-SNAPSHOT.jar"]
\ No newline at end of file
+<<<<<<< HEAD
+ENTRYPOINT ["java", "-jar", "spring-petclinic-3.3.0-SNAPSHOT.jar"]
+=======
+ENTRYPOINT ["java", "-jar", "spring-petclinic-3.3.0-SNAPSHOT.jar"]
+>>>>>>> 8307f0d9db8a3ee317049aaf2831afada88ce7f1