fixing merge conflicts

nav2_bringup/bringup/launch/nav2_localization_launch.py

@@ -36,6 +36,7 @@ def generate_launch_description():
     use_remappings = LaunchConfiguration('use_remappings')
     lifecycle_nodes = ['map_server', 'amcl']
 
+
     # Map fully qualified names to relative ones so the node's namespace can be prepended.
     # In case of the transforms (tf), currently, there doesn't seem to be a better alternative
     # https://github.com/ros/geometry2/issues/32

nav2_bringup/bringup/launch/nav2_navigation_launch.py

@@ -34,8 +34,8 @@ def generate_launch_description():
     params_file = LaunchConfiguration('params_file')
     bt_xml_file = LaunchConfiguration('bt_xml_file')
     use_remappings = LaunchConfiguration('use_remappings')
-
     map_subscribe_transient_local = LaunchConfiguration('map_subscribe_transient_local')
+
     lifecycle_nodes = ['controller_server',
                        'planner_server',
                        'recoveries_server',