diff --git a/roles/ntopng/tasks/main.yaml b/roles/ntopng/tasks/main.yaml
index 822a91b..6866e12 100644
--- a/roles/ntopng/tasks/main.yaml
+++ b/roles/ntopng/tasks/main.yaml
@@ -24,7 +24,6 @@
           chdir: "{{ ansible_user_dir }}/ntopng"
 - name: install
   become: yes
-<<<<<<< HEAD
   command: "make install"
   args:
           chdir: "{{ ansible_user_dir }}/ntopng"