diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..e69de29
diff --git a/nodes/heimdall/wizarr/compose.yaml b/nodes/heimdall/wizarr/compose.yaml
index 2dcf083..514ecf6 100644
--- a/nodes/heimdall/wizarr/compose.yaml
+++ b/nodes/heimdall/wizarr/compose.yaml
@@ -3,8 +3,11 @@ services:
     container_name: wizarr
     mem_limit: 2048m
     image: ghcr.io/wizarrrr/wizarr:v2026.4.0
+<<<<<<< HEAD
     ports:
       - 5690:5690
+=======
+>>>>>>> bbe6f8a (fix(wizarr): remove commented-out ports configuration)
     volumes:
       - /mnt/appdata/wizarr/data:/data/database
     restart: unless-stopped
@@ -22,4 +25,4 @@ services:
 networks:
   proxy-net:
     name: proxy-net
-    external: true
+    external: true
\ No newline at end of file