diff --git a/sshconfig b/sshconfig
index 068f06b..cc92ff0 100644
--- a/sshconfig
+++ b/sshconfig
@@ -62,7 +62,6 @@ Host pihole
 Host azubiserver
     Hostname 10.10.21.40
     User root
-<<<<<<< Updated upstream
 Host jellyfin.vpn 
     Hostname 10.8.0.21
     User zul
@@ -79,7 +78,7 @@ Host t590
     Hostname 10.8.0.13
     User zul
 Host wow
-    Hostname 192.168.15.24
+    Hostname 192.168.15.25
 Host azubivm
     Hostname 10.10.20.63
     User ckoptein