diff --git a/conf/Caddyfile b/conf/Caddyfile
index cb71df0..70e4b61 100644
--- a/conf/Caddyfile
+++ b/conf/Caddyfile
@@ -25,14 +25,11 @@ test.gynther.se {
 	reverse_proxy recipe-flutter:5000
 }
 
-<<<<<<< HEAD
 nzbget.gynther.se {
 	import common
 	reverse_proxy http://192.168.50.4:6789
 }
 
-=======
->>>>>>> 0f6813d (Update Caddyfile routes and auth import)
 prowlarr.gynther.se {
 	import common
 	reverse_proxy http://prowlarr:9696