From e5e87ce077f96f253b58991453a8b2f280e70cc7 Mon Sep 17 00:00:00 2001
From: Seth Foster <seth@opentrons.com>
Date: Mon, 10 Jul 2023 14:27:23 -0400
Subject: [PATCH] fix(app): subtler merge conflicts

---
 app/src/organisms/PipetteWizardFlows/AttachProbe.tsx | 4 ++--
 app/src/organisms/PipetteWizardFlows/Results.tsx     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/organisms/PipetteWizardFlows/AttachProbe.tsx b/app/src/organisms/PipetteWizardFlows/AttachProbe.tsx
index aa1343af2a4..7f146b59c4e 100644
--- a/app/src/organisms/PipetteWizardFlows/AttachProbe.tsx
+++ b/app/src/organisms/PipetteWizardFlows/AttachProbe.tsx
@@ -7,7 +7,7 @@ import {
   SPACING,
   RESPONSIVENESS,
 } from '@opentrons/components'
-import { NINETY_SIX_CHANNEL, LEFT, MotorAxis } from '@opentrons/shared-data'
+import { NINETY_SIX_CHANNEL, LEFT, MotorAxes } from '@opentrons/shared-data'
 import { StyledText } from '../../atoms/text'
 import { CalibrationErrorModal } from './CalibrationErrorModal'
 import { GenericWizardTile } from '../../molecules/GenericWizardTile'
@@ -55,7 +55,7 @@ export const AttachProbe = (props: AttachProbeProps): JSX.Element | null => {
   const is8Channel = attachedPipettes[mount]?.data.channels === 8
   const is96Channel = attachedPipettes[mount]?.data.channels === 96
   const calSlotNum = 'C2'
-  const axes: MotorAxis = mount === LEFT ? ['leftZ'] : ['rightZ']
+  const axes: MotorAxes = mount === LEFT ? ['leftZ'] : ['rightZ']
 
   if (pipetteId == null) return null
   const handleOnClick = (): void => {
diff --git a/app/src/organisms/PipetteWizardFlows/Results.tsx b/app/src/organisms/PipetteWizardFlows/Results.tsx
index df447752c3d..f90070a55a4 100644
--- a/app/src/organisms/PipetteWizardFlows/Results.tsx
+++ b/app/src/organisms/PipetteWizardFlows/Results.tsx
@@ -138,7 +138,7 @@ export const Results = (props: ResultsProps): JSX.Element => {
       flowType === FLOWS.ATTACH &&
       currentStepIndex !== totalStepCount
     ) {
-      const axes: MotorAxis =
+      const axes: MotorAxes =
         mount === LEFT ? ['leftPlunger'] : ['rightPlunger']
       chainRunCommands(
         [