From 381e2bc7fb8fbcf54ef21648a2c9bb5d6b666d78 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Wed, 25 Sep 2024 10:27:31 +0200
Subject: [PATCH] fix: merge conflcit

---
 .../organization-[organization]/members/+page.svelte      | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte
index e85abf47b..17a0a6b85 100644
--- a/src/routes/(console)/organization-[organization]/members/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/members/+page.svelte
@@ -22,15 +22,9 @@
     import { base } from '$app/paths';
     import { isOwner } from '$lib/stores/roles';
     import Edit from './edit.svelte';
-    import { getRoleLabel, upgradeURL } from '$lib/stores/billing';
-    import { BillingPlan } from '$lib/constants';
-    import { isCloud } from '$lib/system';
-<<<<<<< HEAD
+    import { getRoleLabel } from '$lib/stores/billing';
     import { Drop } from '$lib/components';
     import Upgrade from '$lib/components/roles/upgrade.svelte';
-=======
-    import { Button } from '$lib/elements/forms';
->>>>>>> 8777904fabe7e84099a19823a863170d08a3bfb0
 
     export let data: PageData;