diff --git a/.gitignore b/.gitignore
index d00cce35..1352cb25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,11 @@
 .DS_Store
 node_modules
 <<<<<<< HEAD
+<<<<<<< HEAD
 public/bundle.js
 =======
 >>>>>>> add gitignore
+=======
+>>>>>>> d7e40776401060de6d84771a442ddb6f3ea7175d
 static/*
 !static/info.txt
diff --git a/public/resources/upload.svg b/public/resources/upload.svg
index 72c1cc09..d731adba 100644
--- a/public/resources/upload.svg
+++ b/public/resources/upload.svg
@@ -90,5 +90,4 @@
             </g>
         </g>
     </g>
-
 </svg>