diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte
index a57acfc80..e85abf47b 100644
--- a/src/routes/(console)/organization-[organization]/members/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/members/+page.svelte
@@ -25,8 +25,12 @@
     import { getRoleLabel, upgradeURL } from '$lib/stores/billing';
     import { BillingPlan } from '$lib/constants';
     import { isCloud } from '$lib/system';
+<<<<<<< HEAD
     import { Drop } from '$lib/components';
     import Upgrade from '$lib/components/roles/upgrade.svelte';
+=======
+    import { Button } from '$lib/elements/forms';
+>>>>>>> 8777904fabe7e84099a19823a863170d08a3bfb0
 
     export let data: PageData;
 
diff --git a/src/routes/(console)/organization-[organization]/members/edit.svelte b/src/routes/(console)/organization-[organization]/members/edit.svelte
index 57b2e0da8..687404c74 100644
--- a/src/routes/(console)/organization-[organization]/members/edit.svelte
+++ b/src/routes/(console)/organization-[organization]/members/edit.svelte
@@ -57,7 +57,7 @@
             showEdit = false;
             addNotification({
                 type: 'success',
-                message: `Role updated`
+                message: `Role has been updated`
             });
             trackEvent(Submit.MembershipUpdate);
             dispatch('updated', membership);