diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index fcb116e..919c42e 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -14,18 +14,30 @@ services:
 
     labels:
       - "traefik.enable=true"
+<<<<<<< HEAD
+=======
+      # - "traefik.docker.network=proxy"
+>>>>>>> d534f12f7412d036eb157e1463952b9e2b826b2d
       - "traefik.http.routers.gitea.rule=Host(`gitea.lan.ddnsgeek.com`)"
       - "traefik.http.routers.gitea.entrypoints=websecure"
       - "traefik.http.routers.gitea.tls=true"
       - "traefik.http.routers.gitea.tls.certresolver=myresolver"
       - "traefik.http.services.gitea.loadbalancer.server.port=3000"
       - "io.portainer.accesscontrol.public"
+<<<<<<< HEAD
     healthcheck:
       test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:3000/api/v1/version >/dev/null"]
       interval: 15s
       timeout: 5s
       retries: 8
       start_period: 45s
+=======
+      - "traefik.http.routers.gitea.middlewares=error-pages-middleware"
+
+
+#volumes:
+#  gitea_data:
+>>>>>>> d534f12f7412d036eb157e1463952b9e2b826b2d
 
 networks:
   traefik_reverse_proxy: