diff --git a/static/server.sh b/static/server.sh
index d828943..cd3b6d0 100755
--- a/static/server.sh
+++ b/static/server.sh
@@ -127,10 +127,7 @@ ApplyConfig()
 	scp -i ~/.nix-ms/id_rsa mailserver.nix "root@$machineip:/root"
 	scp -i ~/.nix-ms/id_rsa configuration.nix "root@$machineip:/root"
 	scp -i ~/.nix-ms/id_rsa goss.nix "root@$machineip:/root"
-<<<<<<< HEAD
 	scp -i ~/.nix-ms/id_rsa goss.yaml "root@$machineip:/root"
-=======
->>>>>>> ed5f22225d08630ea9993848998a84cef10ffc70
 	ssh -i ~/.nix-ms/id_rsa "root@$machineip" cp /root/mailserver.nix /etc/nixos/mailserver.nix
 	ssh -i ~/.nix-ms/id_rsa "root@$machineip" cp /root/configuration.nix /etc/nixos/configuration.nix
     ssh -i ~/.nix-ms/id_rsa "root@$machineip" cp /root/goss.nix /etc/nixos/goss.nix