Fix merge conflict

Author: anbit-adhi

guidance/los_guidance/launch/los_guidance.launch.py

@@ -27,17 +27,19 @@ def launch_setup(context, *args, **kwargs):
         f"{drone}.yaml",
     )
 
+    return [
+        Node(
+            package="los_guidance",
+            executable="los_guidance_node",
+            name="los_guidance_node",
+            namespace=namespace,
+            parameters=[drone_params, adapt_params],
+            output="screen",
+        )
+    ]
+
 
 def generate_launch_description():
-    los_guidance_node = Node(
-        package="los_guidance",
-        executable="los_guidance_node",
-        name="los_guidance_node",
-        namespace="orca",
-        parameters=[
-            orca_params,
-            adapt_params,
-        ],
-        output="screen",
+    return LaunchDescription(
+        declare_drone_and_namespace_args() + [OpaqueFunction(function=launch_setup)]
     )
-    return LaunchDescription([los_guidance_node])