fix search mobile container

Author: hugosolar

themes/cc-commoners/header.php

@@ -68,7 +68,7 @@
             ?>
         </nav>
     </div>
-    <div class="search-mobile-container">
+    <div class="search-mobile-container show-for-small-only">
         <a class="close" href="#">
             <button class="close-button search" aria-label="Close alert" type="button" data-close>
                 <span aria-hidden="true">&times;</span>

themes/cc-commoners/hub-page.php

@@ -18,9 +18,6 @@
 
 //endwhile; // End of the loop.
 ?>
-
-
-<<<<<<< HEAD
 <div class="grid-container space-top">
 	<div class="grid-x">
 		<div class="cell large-12">