update

@@ -11,13 +11,8 @@
         .search-icon {
             position: absolute;
             font-size: 12px;
-<<<<<<< HEAD
-            top: 14px;
-            left: 24px;
-=======
             top: 9px;
             left: 10px;
->>>>>>> 07ccf4f30b0880e107d15539abc34f479ceb0f95
         }
 
         input {
@@ -36,14 +31,9 @@
         }
 
         .search {
-<<<<<<< HEAD
             position: absolute;
             top: 7px;
             right:0;
-=======
-            float: right;
-            margin-top: 6px;
->>>>>>> 07ccf4f30b0880e107d15539abc34f479ceb0f95
             border: none;
             background: transparent;
             font-size: 16px;