fix linter errors and another rebase error

hardware/opentrons_hardware/hardware_control/move_group_runner.py

@@ -255,16 +255,6 @@ def all_moving_nodes(self) -> Set[NodeId]:
                         node_set.add(node)
         return node_set
 
-    def all_moving_nodes(self) -> Set[NodeId]:
-        """Get all of the moving nodes in the move group runner's move groups."""
-        node_set: Set[NodeId] = set()
-        for group in self._move_groups:
-            for sequence in group:
-                for node, node_step in sequence.items():
-                    if node_step.is_moving_step():
-                        node_set.add(node)
-        return node_set
-
     async def _send_groups(self, can_messenger: CanMessenger) -> None:
         """Send commands to set up the message groups."""
         for group_i, group in enumerate(self._move_groups):

shared-data/python/opentrons_shared_data/pipette/ul_per_mm.py

@@ -17,12 +17,17 @@ def calculate_ul_per_mm(
     requested_pipetting_version: Optional[PipetteFunctionKeyType] = None,
     shaft_ul_per_mm: Optional[float] = None,
 ) -> float:
+    assumed_requested_pipetting_version = (
+        requested_pipetting_version
+        if requested_pipetting_version
+        else PIPETTING_FUNCTION_LATEST_VERSION
+    )
     if action == "aspirate":
         fallback = active_tip_settings.aspirate.default[
             PIPETTING_FUNCTION_FALLBACK_VERSION
         ]
         sequence = active_tip_settings.aspirate.default.get(
-            requested_pipetting_version, fallback
+            assumed_requested_pipetting_version, fallback
         )
     elif action == "blowout" and shaft_ul_per_mm:
         return shaft_ul_per_mm
@@ -31,7 +36,7 @@ def calculate_ul_per_mm(
             PIPETTING_FUNCTION_FALLBACK_VERSION
         ]
         sequence = active_tip_settings.dispense.default.get(
-            requested_pipetting_version, fallback
+            assumed_requested_pipetting_version, fallback
         )
     return piecewise_volume_conversion(ul, sequence)