diff --git a/roles/elk-filebeat-cli/tasks/main.yml b/roles/elk-filebeat-cli/tasks/main.yml
index 321f54d..da37f25 100644
--- a/roles/elk-filebeat-cli/tasks/main.yml
+++ b/roles/elk-filebeat-cli/tasks/main.yml
@@ -8,6 +8,7 @@
   apt:
     deb: "/tmp/filebeat-{{ BEATVER }}-amd64.deb"
 
+<<<<<<< HEAD
 - name: Chgt filebeat.yml - localhost:9200 - Elastic
   replace:
     path: /etc/filebeat/filebeat.yml
@@ -34,6 +35,17 @@
       #  copy:
       #    src: filebeat.yml
       #    dest: /etc/filebeat/filebeat.yml
+=======
+- name: sorie pou debug
+  fail:
+    msg: "packet installe"
+
+
+- name: Changement du fichier de conf
+  copy:
+    src: filebeat.yml
+    dest: /etc/filebeat/filebeat.yml
+>>>>>>> d16ccae (maj pour elk-filebeat-cli)
 
 - name: Configuration de filebeat
   shell: filebeat modules enable system