diff --git a/create_aws_wireguard_server.yml b/create_aws_wireguard_server.yml
index 9d98337..645a356 100644
--- a/create_aws_wireguard_server.yml
+++ b/create_aws_wireguard_server.yml
@@ -33,11 +33,5 @@
 - name: include playbook for pihole
   import_playbook: pihole.yml
 
-<<<<<<< HEAD
-- name: Include playbook to install wireguard
-  import_playbook: wireguard.yml
-
-=======
 - name: include playbook for wireguard server
   import_playbook: wireguard_pihole_only.yml
->>>>>>> 268d550 (Checkin der ewig schon herumliegenden Daten, keine Ahnung mehr was ich)