diff --git a/templates/home_page.hbs b/templates/home_page.hbs
index 4b8816813..d22eed836 100644
--- a/templates/home_page.hbs
+++ b/templates/home_page.hbs
@@ -119,7 +119,7 @@
 
   // Make sure arguments are correctly typed. 
   renderHomepage(settings, homepageData, container);
-<<<<<<< HEAD
+  container.prepend(searchBarPlaceholder);
 </script>
 
 <script type="module">
@@ -133,7 +133,4 @@
 
   // Make sure arguments are correctly typed. 
   renderSideNav(settings, sideNavData, {}, container);
-=======
-  container.prepend(searchBarPlaceholder);
->>>>>>> d1cde96 (add mobile nav and hero search bars)
 </script>
\ No newline at end of file