eppic fail Wade

source/docs/index.md

-<<<<<<< HEAD
 ### PU-ERH MINI FANG-CHA SHU-CHA
 
 **Link** : [cajova dobrych ludi](https://www.e-tea.eu/p/3773/pu-erh-mini-fang-cha-shu-cha)
@@ -45,14 +44,10 @@ Nakolko je posekany na drobno, rozdiel medzi nalevmi je jasne viditelny.
 ---
 
 ### Nantou Si Ji Chun Wu Long Cha
-=======
-### 2019 Nantou Si Ji Chun Wu Long Cha
->>>>>>> b38041d41f3aad7e7742d9564dd355dbd9dd8558
 
 **Alt names**
 
 - 2019 Nantou Si Ji Chun Wu Long Cha čaj oolong
-<<<<<<< HEAD
 
 **Link** : [bozsky orac](https://kvalitnycaj.sk/produkt/oolong-caj-nantou-si-ji-chun-wu-long-cha-oolong/)
 
@@ -215,7 +210,6 @@ Není obvyklé, aby byl vysokohorský čaj z výběrové oblasti zpracován ve s
 ![](pic/Bingdao-daye-shu-pu-erh-1.jpg)
 ![](pic/Bingdao-daye-shu-pu-erh-2.jpg)
 ![](pic/Bingdao-daye-shu-pu-erh-3.jpg)
->>>>>>> b38041d41f3aad7e7742d9564dd355dbd9dd8558
 
 ---
 

source/site/index.html

@@ -200,13 +200,6 @@
     Nantou Si Ji Chun Wu Long Cha
   </a>
   
-</li>
-      
-        <li class="md-nav__item">
-  <a href="#2019-nantou-si-ji-chun-wu-long-cha" class="md-nav__link">
-    2019 Nantou Si Ji Chun Wu Long Cha
-  </a>
-  
 </li>
       
         <li class="md-nav__item">
@@ -408,13 +401,6 @@
     Nantou Si Ji Chun Wu Long Cha
   </a>
   
-</li>
-      
-        <li class="md-nav__item">
-  <a href="#2019-nantou-si-ji-chun-wu-long-cha" class="md-nav__link">
-    2019 Nantou Si Ji Chun Wu Long Cha
-  </a>
-  
 </li>
       
         <li class="md-nav__item">
@@ -561,8 +547,7 @@
                 
                   <h1>Tea</h1>
                 
-                <p>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD</p>
-<h3 id="pu-erh-mini-fang-cha-shu-cha">PU-ERH MINI FANG-CHA SHU-CHA</h3>
+                <h3 id="pu-erh-mini-fang-cha-shu-cha">PU-ERH MINI FANG-CHA SHU-CHA</h3>
 <p><strong>Link</strong> : <a href="https://www.e-tea.eu/p/3773/pu-erh-mini-fang-cha-shu-cha">cajova dobrych ludi</a></p>
 <p><strong>Typ</strong> : <a href="howto/#pu-erh-shu">pu-erh shu</a></p>
 <p><strong>Zazitok</strong> : Standardny pu-erh shu, lisovany v maluch 'cokoladovych kockach'. Nalev je sytej farby, v kanvicke neostal ziadny prach ako po menej kvalitnych hniezdach. Listky su posekane na drobno (po vyluhovani). Prijemny silnejsi pu erh.</p>
@@ -591,27 +576,9 @@
 <img alt="" src="pic/pu-erh-mandarinka-4.jpg" /></p>
 <hr />
 <h3 id="nantou-si-ji-chun-wu-long-cha">Nantou Si Ji Chun Wu Long Cha</h3>
-<p>=======</p>
-<h3 id="2019-nantou-si-ji-chun-wu-long-cha">2019 Nantou Si Ji Chun Wu Long Cha</h3>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<p>b38041d41f3aad7e7742d9564dd355dbd9dd8558</p>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
 <p><strong>Alt names</strong></p>
 <ul>
-<li>2019 Nantou Si Ji Chun Wu Long Cha čaj oolong
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD</li>
+<li>2019 Nantou Si Ji Chun Wu Long Cha čaj oolong</li>
 </ul>
 <p><strong>Link</strong> : <a href="https://kvalitnycaj.sk/produkt/oolong-caj-nantou-si-ji-chun-wu-long-cha-oolong/">bozsky orac</a></p>
 <p><strong>Typ</strong> : <a href="howto/#oolong">oolong</a></p>
@@ -717,21 +684,6 @@
 <p><img alt="" src="pic/Bingdao-daye-shu-pu-erh-1.jpg" />
 <img alt="" src="pic/Bingdao-daye-shu-pu-erh-2.jpg" />
 <img alt="" src="pic/Bingdao-daye-shu-pu-erh-3.jpg" /></p>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<p>b38041d41f3aad7e7742d9564dd355dbd9dd8558</p>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
 <hr />
 <h3 id="medium-roasted-chin-shin-dong-ding-oolong">medium roasted chin shin dong ding oolong</h3>
 <p><strong>Alt names</strong></p>