diff --git a/updater/src/index.html b/updater/src/index.html
index e865eaa..a48f660 100644
--- a/updater/src/index.html
+++ b/updater/src/index.html
@@ -17,16 +17,13 @@
     <input type="text" id="dirBox" name="name" size="80" readonly>
     <progress id="progressbar" max="100" value="0"></progress>
 
-<<<<<<< HEAD
 
     <button id="update">Check for update</button>
 
     <select name="Dropme Down" id="gng"></select>
     <button id="getFiles">Get Files</button>
     <select name="Dropme Down #2" id="files"></select>
-=======
     <button id="git">Do Git Operations</button>    
->>>>>>> 2a8f20c2d57676c3963cd61f7bbc3740a707c725
 
     <script src="./renderer.js"></script>
   </body>