diff --git a/ansible/wg.yml b/ansible/wg.yml
index 4d39baa..8fb6120 100644
--- a/ansible/wg.yml
+++ b/ansible/wg.yml
@@ -1,6 +1,5 @@
 ---
 - hosts: wg
-<<<<<<< HEAD
   become: yes
   tasks:
     - name: arrete unattended-upgrades
@@ -34,7 +33,7 @@
     - name: récupération du fichier wg0-2.conf vers ap33-ans
       fetch:
         src: wg0-2.conf
-	dest: wg0-2.conf
+        dest: wg0-2.conf
         flat: yes
 
 - hosts: wg
@@ -64,27 +63,3 @@
       service:
         name: wg-quick@wg0.service
         state: restarted
-=======
-  tasks:
-  - name: installe Wireguard
-    apt:
-      name:
-        - wireguard
-        - wireguard-tools
-      state: present
-
-- hosts: wg-master
-  tasks:
-  - name: copie le fichier wg1-a.conf et wg1-b.conf vers les machines master et cli
-    copy:
-      src: mkwgconf.sh
-      dest: mkwgconf.sh
-      flat: yes
-  - name: generations fichier configuration wireguard wg0-1.conf etc
-    shell: bash mkwgconf.sh
-      
-- hosts: wg-cli
-  tasks:
-  - name: copie fichier 
-
->>>>>>> d6e080d0145615056a7a0eb3d2f9e512809eb4f5