diff --git a/docker-compose.yml b/docker-compose.yml
index eb799268..8b6a7195 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,6 @@ services:
     image: jeecg-boot-system
     hostname: jeecg-boot-system
     ports:
-<<<<<<< Updated upstream
       - 25525:8080s
     networks:
       - jeecg-boot