diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index da00694..2097013 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,6 +1,9 @@
 <script>
 	import Highlight from "$lib/Highlight.svelte";
+<<<<<<< HEAD
 	import LinkChip from "$lib/components/LinkChip.svelte";
+=======
+>>>>>>> 9781dc7 (feat(root page): redesign the hero element, add dividers between sections)
 	import FlowerDivider from "$lib/components/FlowerDivider.svelte";
 
 	import nix from "svelte-highlight/languages/nix";