diff --git a/fedora.yml b/fedora.yml
index 181cecc..1c1b3a3 100644
--- a/fedora.yml
+++ b/fedora.yml
@@ -1,12 +1,7 @@
 ---
 - name: Linux Installation Meines PCs.
-<<<<<<< HEAD
   remote_user: root
   hosts: all
-=======
-  remote_user: ansi
-  hosts: kickdev.local
->>>>>>> pan/HEAD
   become: true
   vars_files:
     - ./vars/user_config.yaml