diff --git a/tests/foreman/cli/test_repositories.py b/tests/foreman/cli/test_repositories.py
index 81cbf7db573..f772794d4dc 100644
--- a/tests/foreman/cli/test_repositories.py
+++ b/tests/foreman/cli/test_repositories.py
@@ -127,11 +127,7 @@ def test_positive_disable_rh_repo_with_basearch(module_target_sat, module_entitl
     assert 'Repository disabled' in disabled_repo[0]['message']
 
 
-<<<<<<< HEAD
 def test_reclaim_space_command_no_exception(module_target_sat, module_sca_manifest_org):
-=======
-def test_reclaim_space_command_no_exception(module_target_sat, module_entitlement_manifest_org):
->>>>>>> cd4dacbfa (change test name)
     """Hammer repository reclaim-space should not throw any improper exceptions
 
     :id: 74b669d8-ee6b-4fc6-864f-91410d7ea3c2