diff --git a/doc/EN/meshindex.org b/doc/EN/meshindex.org
index 86d10914..b0c266ca 100644
--- a/doc/EN/meshindex.org
+++ b/doc/EN/meshindex.org
@@ -10,7 +10,6 @@
 [[file:images/logo.png]]
 
 * Welcome to the Freedombone Mesh
->>>>>>> 9b2ac0e151a7d39cc6d29d10c465e88e1882efec
 
 #+BEGIN_EXPORT html
  <center>