Resolve merge conflicts

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>

Author: emersonknapp

launch_ros/launch_ros/actions/load_composable_nodes.py

@@ -232,16 +232,6 @@ def execute(
 
         # Generate load requests before execute() exits to avoid race with context changing
         # due to scope change (e.g. if loading nodes from within a GroupAction).
-<<<<<<< HEAD
-        load_node_requests = [
-            get_composable_node_load_request(node_description, context)
-            for node_description in self.__composable_node_descriptions
-        ]
-
-        context.add_completion_future(
-            context.asyncio_loop.run_in_executor(
-                None, self._load_in_sequence, load_node_requests, context
-=======
         load_node_requests = []
         autostart_actions = []
         for node_description in self.__composable_node_descriptions:
@@ -275,9 +265,7 @@ def execute(
                 context.asyncio_loop.run_in_executor(
                     None, self._load_in_sequence, load_node_requests, context
                 )
->>>>>>> 3569f0d (Autostarting lifecycle nodes and example launch file demo (#430))
             )
-        )
 
         load_actions = super().execute(context)
         if load_actions is not None and len(autostart_actions) != 0:

launch_ros/launch_ros/event_handlers/on_state_transition.py

@@ -32,13 +32,8 @@ class OnStateTransition(EventHandler):
     def __init__(
         self,
         *,
-<<<<<<< HEAD
-        entities: SomeActionsType,
-        target_lifecycle_node: LifecycleNode = None,
-=======
         entities: SomeEntitiesType,
         target_lifecycle_node: Optional['LifecycleNode'] = None,  # noqa: F821
->>>>>>> 3569f0d (Autostarting lifecycle nodes and example launch file demo (#430))
         transition: Optional[SomeSubstitutionsType] = None,
         start_state: Optional[SomeSubstitutionsType] = None,
         goal_state: Optional[SomeSubstitutionsType] = None,