diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 880bad531..7c8d5b92a 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -114,13 +114,9 @@ services:
     image: ${IMAGE_REPOSITORY}/file:${IMAGE_TAG}
     container_name: firstleg-${DEPLOY_ENV:-test}-file
     ports: ["${FILE_PORT:-9206}:9206"]
-<<<<<<< HEAD
-    volumes: ["${FILE_UPLOADS_HOST_DIR:-/data/firstleg/uploads}:/data/files"]
-=======
     volumes:
-      - firstleg-file-data:/data/files
+      - "${FILE_UPLOADS_HOST_DIR:-/data/firstleg/uploads}:/data/files"
       - "${LOG_ROOT:-/data/logs/baiyue-firstleg}/file:/app/logs"
->>>>>>> 7872afb90b4974c8d3c6788a3b2989ecd1d3b294
     environment:
       <<: *common-environment
       SERVER_PORT: 9206