Fix merge conflicts

plugins/circleci/src/pages/BuildWithStepsPage/BuildWithStepsPage.tsx

@@ -22,8 +22,9 @@ import { makeStyles } from '@material-ui/core/styles';
 import { PluginHeader } from '../../components/PluginHeader';
 import { ActionOutput } from './lib/ActionOutput/ActionOutput';
 import { Layout } from '../../components/Layout';
-import { useBuildWithSteps, useSettings } from '../../state';
 import LaunchIcon from '@material-ui/icons/Launch';
+import { useSettings } from '../../state/useSettings';
+import { useBuildWithSteps } from '../../state/useBuildWithSteps';
 
 const IconLink = IconButton as typeof Link;
 const BuildName: FC<{ build: BuildWithSteps | null }> = ({ build }) => (

plugins/circleci/src/pages/BuildsPage/lib/Builds/Builds.tsx

@@ -16,7 +16,8 @@
 import React, { FC, useEffect } from 'react';
 import { CITableBuildInfo, CITable } from '../CITable';
 import { BuildSummary } from '../../../../api';
-import { useSettings, useBuilds } from '../../../../state';
+import { useBuilds } from '../../../../state/useBuilds';
+import { useSettings } from '../../../../state/useSettings';
 
 const makeReadableStatus = (status: string | undefined) => {
   if (!status) return '';

plugins/circleci/src/pages/SettingsPage/SettingsPage.tsx

@@ -27,7 +27,7 @@ import { Alert } from '@material-ui/lab';
 import { InfoCard, Content } from '@backstage/core';
 import { Layout } from '../../components/Layout';
 import { PluginHeader } from '../../components/PluginHeader';
-import { useSettings } from '../../state';
+import { useSettings } from '../../state/useSettings';
 
 const SettingsPage = () => {
   const [

plugins/circleci/src/state/AppState.tsx

@@ -15,8 +15,8 @@
  */
 import React, { FC, useReducer, Dispatch, Reducer } from 'react';
 import { circleCIApiRef } from '../api';
-import { State, Action, SettingsState } from './types';
-export { SettingsState };
+import type { SettingsState, State, Action } from './types';
+export type { SettingsState };
 import equal from 'fast-deep-equal';
 
 export const AppContext = React.createContext<[State, Dispatch<Action>]>(

plugins/circleci/src/state/index.ts

@@ -14,6 +14,3 @@
  * limitations under the License.
  */
 export * from './AppState';
-export * from './useBuildWithSteps';
-export * from './useBuilds';
-export * from './useSettings';

plugins/circleci/src/state/useSettings.ts

@@ -20,7 +20,6 @@ import { useApi, errorApiRef } from '@backstage/core';
 export function useSettings() {
   const [{ settings }, dispatch] = useContext(AppContext);
 
-
   const errorApi = useApi(errorApiRef);
 
   const rehydrate = () => {