diff --git a/src/ska_tango_base/base/task_queue_manager.py b/src/ska_tango_base/base/task_queue_manager.py
index 5ce0a59e15c8f4999c6357f0ae1cc8f88d63255d..dc4a384902ea53e0b24b8d5ee167b968a36a2b9f 100644
--- a/src/ska_tango_base/base/task_queue_manager.py
+++ b/src/ska_tango_base/base/task_queue_manager.py
@@ -381,16 +381,12 @@ class QueueManager:
             """
             try:
                 if hasattr(task, "is_allowed"):
-<<<<<<< HEAD:src/ska_tango_base/base/task_queue_manager.py
-                    if not task.is_allowed():
-=======
                     is_allowed_signature = signature(task.is_allowed)
                     if "raise_if_disallowed" in is_allowed_signature.parameters:
                         is_task_allowed = task.is_allowed(raise_if_disallowed=True)
                     else:
                         is_task_allowed = task.is_allowed()
                     if not is_task_allowed:
->>>>>>> main:src/ska_tango_base/base/task_queue_component_manager.py
                         return TaskResult(
                             ResultCode.NOT_ALLOWED, "Command not allowed", unique_id
                         )