pus_tc/tc_packer_hook.py

@@ -242,13 +242,8 @@ def pack_service_queue_user(
             tc_queue=service_queue, object_id=RW_ASSEMBLY, op_code=op_code
         )
     if service == CustomServiceList.CONTROLLERS.value:
-<<<<<<< HEAD
         return pack_controller_commands(tc_queue=service_queue, op_code=op_code)
     LOGGER.warning(f"Invalid Service {service}")
-=======
-        return pack_cmd_ctrl_to_prompted_mode(tc_queue=service_queue, op_code=op_code)
-    LOGGER.warning("Invalid Service !")
->>>>>>> origin/develop
 
 
 def create_total_tc_queue_user() -> TcQueueT: