Fix

.readme/_languages.md

@@ -74,10 +74,6 @@
 		<tr><td align="left">Vietnamese</td><td align="right">31</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/vie.m3u</code></td></tr>
 		<tr><td align="left">Western Frisian</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fry.m3u</code></td></tr>
 		<tr><td align="left">Yue Chinese</td><td align="right">14</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/yue.m3u</code></td></tr>
-<<<<<<< HEAD
-		<tr><td align="left">Undefined</td><td align="right">304</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/undefined.m3u</code></td></tr>
-=======
-		<tr><td align="left">Undefined</td><td align="right">340</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/undefined.m3u</code></td></tr>
->>>>>>> 7083f628c0b468e4f523b50280b9872b31074f49
+		<tr><td align="left">Undefined</td><td align="right">340</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/undefined.m3u</code>
 	</tbody>
-</table>
+</table>