diff --git a/roles/mellanox_drivers/tasks/main.yml b/roles/mellanox_drivers/tasks/main.yml
index d2a16b47127604c947aa32d9b6f650cd3ba1af67..7046800e15610a4aa2b9a94ae96b6a463ae55360 100644
--- a/roles/mellanox_drivers/tasks/main.yml
+++ b/roles/mellanox_drivers/tasks/main.yml
@@ -148,8 +148,4 @@
 - name: enable roce_mode setting
   service: name=roce_mode state=started enabled=yes
   become: true
-<<<<<<< HEAD
-  when: start_roce_service is undefined or start_roce_service is true
-=======
   when: start_roce_service is undefined or start_roce_service
->>>>>>> origin/master