diff --git a/nginx.conf b/nginx.conf
index a69c4cb..2a1b5db 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,5 +1,5 @@
 server {
-    listen 3004;  # 修改为Docker Compose中映射的前端端口（与docker-compose.yml保持一致）
+    listen 3004;  # 修改为Docker Compose中映射的前端端口
 
     server_name _;  # 允许所有域名访问
 
@@ -12,11 +12,7 @@
 
     # 反向代理API请求到后端
     location /api/ {
-<<<<<<< HEAD
-        proxy_pass http://backend/;  # 保持相对路径
-=======
         proxy_pass http://team4.10813352.xyz:5004;  # 代理路径与后端API前缀匹配
->>>>>>> 16ac8f6a916a433ddbdd363b7be8246307e76f01
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;