diff --git a/assets/templates/uploads.html b/assets/templates/uploads.html
index dcdf526..74b85fc 100644
--- a/assets/templates/uploads.html
+++ b/assets/templates/uploads.html
@@ -1,20 +1,14 @@
 <head>
-<<<<<<< HEAD
   <!-- Google Fonts -->
   <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet"
     type="text/css">
-=======
-  <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
->>>>>>> 3e3eca1b3fe4254614dadc63f41fe2e72405e83f
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
   <link href="assets/dashboard/plugins/node-waves/waves.css" rel="stylesheet" />
   <link href="assets/dashboard/plugins/animate-css/animate.css" rel="stylesheet" />
   <link href="assets/dashboard/css/style.css" rel="stylesheet">
-<<<<<<< HEAD
   <link rel="stylesheet"
     href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css">
   <!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes -->
-=======
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css">
 >>>>>>> 3e3eca1b3fe4254614dadc63f41fe2e72405e83f
   <link href="assets/dashboard/css/themes/all-themes.css" rel="stylesheet" />
@@ -511,12 +505,7 @@
     <!-- end analyze data modal -->
 
     <!-- begin mined block checking modal -->
-<<<<<<< HEAD
-    <div class="modal fade" id="minedBlockTrackerModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel"
-      aria-hidden="true" data-backdrop="static">
-=======
     <div class="modal fade" id="minedBlockTrackerModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" aria-hidden="true" data-backdrop="static" style="background-color: #840032">
->>>>>>> 3e3eca1b3fe4254614dadc63f41fe2e72405e83f
       <div class="modal-dialog" role="document">
         <div class="modal-content" style="background-color: #840032;">
           <div class="modal-header">
@@ -557,12 +546,7 @@
     <!-- end mined block checking modal -->
 
     <!-- begin preparing upload modal -->
-<<<<<<< HEAD
-    <div class="modal fade" id="preparingUploadModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel"
-      aria-hidden="true" data-backdrop="static">
-=======
     <div class="modal fade" id="preparingUploadModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" aria-hidden="true" data-backdrop="static" style="background-color: #840032">
->>>>>>> 3e3eca1b3fe4254614dadc63f41fe2e72405e83f
       <div class="modal-dialog" role="document">
         <div class="modal-content" style="background-color: #840032;">
           <div class="modal-header">
