From 13eb8df95cdc1f4abaca252bf4a5951fd4249583 Mon Sep 17 00:00:00 2001
From: panteliselef <panteliselef@outlook.com>
Date: Wed, 22 Nov 2023 16:40:36 +0200
Subject: [PATCH] fix(repo): Resolve conflicts

---
 .../OrganizationProfile/OrganizationProfileNavbar.tsx           | 2 +-
 .../components/UserProfile/EnterpriseAccountsSection.tsx        | 2 +-
 packages/react/src/contexts/IsomorphicClerkContext.tsx          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationProfileNavbar.tsx b/packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationProfileNavbar.tsx
index 0b7831f9693..b8300940aa0 100644
--- a/packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationProfileNavbar.tsx
+++ b/packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationProfileNavbar.tsx
@@ -1,9 +1,9 @@
 import { useOrganization } from '@clerk/shared/react';
 import React from 'react';
 
-import { useOrganizationProfileContext } from '../../contexts';
 import { useGate } from '../../common';
 import { ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID } from '../../constants';
+import { useOrganizationProfileContext } from '../../contexts';
 import { Breadcrumbs, NavBar, NavbarContextProvider, OrganizationPreview } from '../../elements';
 import type { PropsOfComponent } from '../../styledSystem';
 
diff --git a/packages/clerk-js/src/ui.retheme/components/UserProfile/EnterpriseAccountsSection.tsx b/packages/clerk-js/src/ui.retheme/components/UserProfile/EnterpriseAccountsSection.tsx
index 1424b86ae4e..99f62756241 100644
--- a/packages/clerk-js/src/ui.retheme/components/UserProfile/EnterpriseAccountsSection.tsx
+++ b/packages/clerk-js/src/ui.retheme/components/UserProfile/EnterpriseAccountsSection.tsx
@@ -1,10 +1,10 @@
 import { useUser } from '@clerk/shared/react';
 import type { SamlAccountResource } from '@clerk/types';
 
-import { useRouter } from '../../router';
 import { Badge, Col, descriptors, Flex, Image, localizationKeys } from '../../customizables';
 import { ProfileSection, UserPreview } from '../../elements';
 import { useSaml } from '../../hooks';
+import { useRouter } from '../../router';
 import { UserProfileAccordion } from './UserProfileAccordion';
 
 export const EnterpriseAccountsSection = () => {
diff --git a/packages/react/src/contexts/IsomorphicClerkContext.tsx b/packages/react/src/contexts/IsomorphicClerkContext.tsx
index 9b03ebd06bd..765326db501 100644
--- a/packages/react/src/contexts/IsomorphicClerkContext.tsx
+++ b/packages/react/src/contexts/IsomorphicClerkContext.tsx
@@ -1,6 +1,6 @@
 import { ClerkInstanceContext, useClerkInstanceContext } from '@clerk/shared/react';
 
-import type IsomorphicClerk from '../isomorphicClerk';
+import type { IsomorphicClerk } from '../isomorphicClerk';
 
 export const IsomorphicClerkContext = ClerkInstanceContext;
 export const useIsomorphicClerkContext = useClerkInstanceContext as unknown as () => IsomorphicClerk;