diff --git a/web/src/lib/components/photos-page/asset-date-group.svelte b/web/src/lib/components/photos-page/asset-date-group.svelte
index fc9ef6316a..126cfbcf9b 100644
--- a/web/src/lib/components/photos-page/asset-date-group.svelte
+++ b/web/src/lib/components/photos-page/asset-date-group.svelte
@@ -14,14 +14,9 @@
   import { mdiCheckCircle, mdiCircleOutline } from '@mdi/js';
   import { fly, scale } from 'svelte/transition';
   import Thumbnail from '../assets/thumbnail/thumbnail.svelte';
-<<<<<<< HEAD
-  import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
-  import { scale } from 'svelte/transition';
-=======
 
->>>>>>> origin/main
-  import { flip } from 'svelte/animate';
   import { uploadAssetsStore } from '$lib/stores/upload';
+  import { flip } from 'svelte/animate';
 
   let { isUploading } = uploadAssetsStore;