diff --git a/tests/integration/targets/helm/tasks/main.yml b/tests/integration/targets/helm/tasks/main.yml
index df436fa8..497bf575 100644
--- a/tests/integration/targets/helm/tasks/main.yml
+++ b/tests/integration/targets/helm/tasks/main.yml
@@ -6,8 +6,5 @@
   with_items:
     - "v3.15.4"
     - "v3.16.0"
-<<<<<<< HEAD
-=======
     - "v3.17.0"
     - "v4.0.0"
->>>>>>> 13791ec (Limit compatibility to Helm =>v3.0.0,<4.0.0 (#1039))