diff --git a/public/templates/home.html b/public/templates/home.html
index b1ab0c7..67c4fbc 100644
--- a/public/templates/home.html
+++ b/public/templates/home.html
@@ -52,11 +52,8 @@
           <li role="presentation">
               <span class="glyphicon glyphicon-time"></span> {{.Created}}</li>
         <li role="presentation">
-<<<<<<< HEAD
+
               <a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
-=======
-                          <a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
->>>>>>> 474ffbc0ea29e8ccacc707893a07534a4afed961
 						  <span class="glyphicon glyphicon-lock"></span></a></li> 
       <li role="presentation">
         <a role="menuitem" tabindex="-1" href="/trash/{{.Id}}">