diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index f8b2fa54..dff41b97 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -184,16 +184,8 @@ import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import DealsIcon from '@/components/Icons/DealsIcon.vue'
 import DealsListView from '@/components/ListViews/DealsListView.vue'
-<<<<<<< HEAD
-<<<<<<< HEAD
-import { formatDate, timeAgo } from '@/utils'
-import { showAddressModal, addressProps } from '@/composables/modals'
-=======
-import AddressModal from '@/components/Modals/AddressModal.vue'
-=======
->>>>>>> 42285dd9 (fix: unused import due to merge conflict)
 import { formatDate, timeAgo, validateIsImageFile } from '@/utils'
->>>>>>> c6ad1085 (refactor: DRY up validate image file)
+import { showAddressModal, addressProps } from '@/composables/modals'
 import { getView } from '@/utils/view'
 import { getSettings } from '@/stores/settings'
 import { getMeta } from '@/stores/meta'
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 6b68058b..d02d5af9 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -344,18 +344,13 @@ import SidePanelLayout from '@/components/SidePanelLayout.vue'
 import FieldLayout from '@/components/FieldLayout/FieldLayout.vue'
 import SLASection from '@/components/SLASection.vue'
 import CustomActions from '@/components/CustomActions.vue'
-<<<<<<< HEAD
-import { openWebsite, setupCustomizations, copyToClipboard } from '@/utils'
-import { showQuickEntryModal, quickEntryProps } from '@/composables/modals'
-=======
 import {
   openWebsite,
-  setupAssignees,
   setupCustomizations,
   copyToClipboard,
-  validateIsImageFile
+  validateIsImageFile,
 } from '@/utils'
->>>>>>> c6ad1085 (refactor: DRY up validate image file)
+import { showQuickEntryModal, quickEntryProps } from '@/composables/modals'
 import { getView } from '@/utils/view'
 import { getSettings } from '@/stores/settings'
 import { sessionStore } from '@/stores/session'
diff --git a/frontend/src/pages/MobileContact.vue b/frontend/src/pages/MobileContact.vue
index 66989de1..b2c27b58 100644
--- a/frontend/src/pages/MobileContact.vue
+++ b/frontend/src/pages/MobileContact.vue
@@ -11,7 +11,10 @@
     </header>
   </LayoutHeader>
   <div v-if="contact.data" class="flex flex-col h-full overflow-hidden">
-    <FileUploader @success="changeContactImage" :validateFile="validateIsImageFile">
+    <FileUploader
+      @success="changeContactImage"
+      :validateFile="validateIsImageFile"
+    >
       <template #default="{ openFileSelector, error }">
         <div class="flex flex-col items-start justify-start gap-4 p-4">
           <div class="flex gap-4 items-center">
@@ -167,15 +170,7 @@ import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import DealsIcon from '@/components/Icons/DealsIcon.vue'
 import DealsListView from '@/components/ListViews/DealsListView.vue'
-<<<<<<< HEAD
-<<<<<<< HEAD
-import { formatDate, timeAgo } from '@/utils'
-=======
-import AddressModal from '@/components/Modals/AddressModal.vue'
-=======
->>>>>>> ab409dfd (fix: yet another unused import due to merge conflict)
 import { formatDate, timeAgo, validateIsImageFile } from '@/utils'
->>>>>>> c6ad1085 (refactor: DRY up validate image file)
 import { getView } from '@/utils/view'
 import { showAddressModal, addressProps } from '@/composables/modals'
 import { getSettings } from '@/stores/settings'