diff --git a/public/assets/js/site.js b/public/assets/js/site.js
index fecd120..d6925ce 100644
--- a/public/assets/js/site.js
+++ b/public/assets/js/site.js
@@ -82,13 +82,10 @@ jQuery(function($) {
       }
       
       audio.addEventListener('timeupdate',function(){
-<<<<<<< HEAD
         var currentTime = audio.currentTime;  
         Cookies.set("lastep-time", currentTime);
-=======
           var currentTime = audio.currentTime;
           Cookies.set("lastep-time", currentTime, { expires: 365 });
->>>>>>> 9f36b512a893a4955dde67afea5f1b675cf31c05
       },false);
   });
 
diff --git a/public/index.html b/public/index.html
index 7257381..9c6b8d2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -112,7 +112,6 @@
                                     d'épisode en cours</a></div>
                                 <div id="sbody"></div>
                                 <div id="audioplayerdiv">
-                                <a class="m-auto" id="audioplayerdivstop" href="#" onclick="javascript:stopplayer()"><img src="assets/img/stop-button-svgrepo-com.svg" width="6%"></a>
                                 <audio style="width: 90%;" controls id="player">
                                 <source src="" type="audio/mpeg">
                                 :)