Lint files that had a merge conflict

packages/synapse-react-client/src/components/ProjectViewCarousel/ProjectViewCarousel.tsx

@@ -1,13 +1,13 @@
+import { QueryBundleRequest } from '@sage-bionetworks/synapse-types'
+import React, { useEffect, useState } from 'react'
+import { Box } from '@mui/system'
 import SynapseClient from '../../synapse-client'
 import { SynapseConstants, useSynapseContext } from '../../utils'
 import { getFieldIndex } from '../../utils/functions/queryUtils'
 import useGetQueryResultBundle from '../../synapse-queries/entity/useGetQueryResultBundle'
-import { QueryBundleRequest } from '@sage-bionetworks/synapse-types'
-import React, { useEffect, useState } from 'react'
 import Carousel from '../Carousel/Carousel'
-import { ProjectViewCard } from './ProjectViewCard'
 import { ErrorBanner } from '../error/ErrorBanner'
-import { Box } from '@mui/system'
+import { ProjectViewCard } from './ProjectViewCard'
 
 export type ProjectViewCarouselProps = {
   entityId: string

packages/synapse-react-client/src/components/QueryWrapper/QueryWrapperLoadingScreen.tsx

@@ -1,8 +1,8 @@
-import { useQueryContext } from '../QueryContext'
 import { useAtomValue } from 'jotai'
-import { isLoadingNewBundleAtom, tableQueryDataAtom } from './QueryWrapper'
 import { Box, LinearProgress, Typography } from '@mui/material'
 import React from 'react'
+import { useQueryContext } from '../QueryContext'
+import { isLoadingNewBundleAtom, tableQueryDataAtom } from './QueryWrapper'
 
 export default function QueryWrapperLoadingScreen() {
   const { asyncJobStatus } = useQueryContext()

packages/synapse-react-client/src/components/QueryWrapperPlotNav/FilterAndView.tsx

@@ -1,10 +1,10 @@
 import React from 'react'
+import { useDeepCompareMemoize } from 'use-deep-compare-effect'
 import CardContainer from '../CardContainer'
 import SynapseTable, { SynapseTableProps } from '../SynapseTable'
 import { CardConfiguration } from '../CardContainerLogic'
-import LastUpdatedOn from './LastUpdatedOn'
-import { useDeepCompareMemoize } from 'use-deep-compare-effect'
 import QueryWrapperLoadingScreen from '../QueryWrapper/QueryWrapperLoadingScreen'
+import LastUpdatedOn from './LastUpdatedOn'
 
 export type FilterAndViewProps = {
   tableConfiguration?: SynapseTableProps