removing other non related conflicts due to merge
removing other non related conflicts due to merge

OpenTrons/opentrons-api,OpenTrons/opentrons-api,OpenTrons/opentrons-api,Opentrons/labware,OpenTrons/opentrons_sdk,OpenTrons/opentrons-api,OpenTrons/opentrons-api