diff --git a/public/resources/upload.svg b/public/resources/upload.svg
index a1a3d06a..72c1cc09 100644
--- a/public/resources/upload.svg
+++ b/public/resources/upload.svg
@@ -90,8 +90,5 @@
             </g>
         </g>
     </g>
-<<<<<<< HEAD
+
 </svg>
-=======
-</svg>
->>>>>>> upload page ui