diff --git a/install-update-zabbix-agent.ps1 b/install-update-zabbix-agent.ps1
index 83c8c56..37f5487 100644
--- a/install-update-zabbix-agent.ps1
+++ b/install-update-zabbix-agent.ps1
@@ -12,12 +12,7 @@
 # Konfiguration (manuell anpassen)
 # --------------------------------------------------------------------------
 
-<<<<<<< Updated upstream
-$ZabbixServer  = "zabbix.server-nb.de"     # Zabbix-Server-Adresse
-$ZabbixVersion = "7.4.7"                  # Zabbix-Version (bei neuen Releases anpassen)
-=======
 $ScriptVersion = "1.2"                   # Skript-Version
->>>>>>> Stashed changes
 
 $ZabbixServer  = "zabbix.server-nb.de"   # Zabbix-Server-Adresse
 $ZabbixVersion = "7.4.7"                 # Zabbix Agent-Version (bei neuen Releases anpassen)