diff --git a/public/index.html b/public/index.html
index 987ae210..ca7683d4 100644
--- a/public/index.html
+++ b/public/index.html
@@ -40,11 +40,9 @@
           <th width=20%>Expires in</th>
           <th width=5%>Delete</th>
         </tr>
-
       </table>
     </div>
 
   </div>
-
 </body>
 </html>
diff --git a/public/resources/upload.svg b/public/resources/upload.svg
index d731adba..a1a3d06a 100644
--- a/public/resources/upload.svg
+++ b/public/resources/upload.svg
@@ -90,4 +90,8 @@
             </g>
         </g>
     </g>
+<<<<<<< HEAD
 </svg>
+=======
+</svg>
+>>>>>>> upload page ui