diff --git a/ros2controlcli/ros2controlcli/verb/list_hardware_components.py b/ros2controlcli/ros2controlcli/verb/list_hardware_components.py
index abce8bfb04..704581ae5e 100644
--- a/ros2controlcli/ros2controlcli/verb/list_hardware_components.py
+++ b/ros2controlcli/ros2controlcli/verb/list_hardware_components.py
@@ -38,8 +38,15 @@ def main(self, *, args):
             hardware_components = list_hardware_components(node, args.controller_manager)
 
             for idx, component in enumerate(hardware_components.component):
+<<<<<<< HEAD
                 print(f'Hardware Component {idx+1}\n\tname: {component.name}\n\ttype: {component.type}')
                 if hasattr(component, 'plugin_name'):
+=======
+                print(
+                    f"Hardware Component {idx+1}\n\tname: {component.name}\n\ttype: {component.type}"
+                )
+                if hasattr(component, "plugin_name"):
+>>>>>>> e14497e (Improve list hardware components output and code for better readability. (#1060))
                     plugin_name = component.plugin_name
                 # Keep compatibility to the obsolete filed name in Humble
                 elif hasattr(component, 'class_type'):
@@ -47,9 +54,17 @@ def main(self, *, args):
                 else:
                     plugin_name = f'{bcolors.WARNING}plugin name missing!{bcolors.ENDC}'
 
+<<<<<<< HEAD
                 print(f'\tplugin name: {plugin_name}\n'
                       f'\tstate: id={component.state.id} label={component.state.label}\n'
                       f'\tcommand interfaces')
+=======
+                print(
+                    f"\tplugin name: {plugin_name}\n"
+                    f"\tstate: id={component.state.id} label={component.state.label}\n"
+                    f"\tcommand interfaces"
+                )
+>>>>>>> e14497e (Improve list hardware components output and code for better readability. (#1060))
                 for cmd_interface in component.command_interfaces:
 
                     if cmd_interface.is_available: