fix linter errors and another rebase error #40503

Job	Run time
opentrons app frontend unit tests	19m 28s
opentrons app-shell unit tests on windows-2022	6m 16s
Determine build variant and type	1s
opentrons discovery-client unit tests on windows-2022	6m 0s
opentrons app-shell unit tests on ubuntu-22.04	3m 23s
opentrons app-shell-odd unit tests on ubuntu-22.04	3m 22s
opentrons discovery-client unit tests on ubuntu-22.04	2m 57s
opentrons app-shell unit tests on macos-latest	3m 18s
opentrons app-shell-odd unit tests on macos-latest	3m 26s
opentrons discovery-client unit tests on macos-latest	3m 15s
Build ${{ matrix.variant }} ${{ matrix.target }} app on ${{ matrix.os }}	0s
Deploy built app artifacts to S3	0s
	51m 26s

Provide feedback