Fix error and table problem

wikipedia_to_hdoc/xslt/wiki_to_hdoc.xsl

@@ -360,11 +360,7 @@
         </xsl:if>
     </xsl:template>
 
-<<<<<<< HEAD
 
-=======
-    
->>>>>>> 9e71c9879b4cfdf2138a088b173de4011fd5869f
     <!-- Simple Tables -->
     <xsl:template match="table" mode="#all">
         <xsl:choose>
@@ -500,5 +496,5 @@
     <xsl:template match="div[@id='mw-navigation']/h2"/>
 
     <!-- Ignoring divs by default: they are not relevant to us -->
-    <xsl:template match="div" mode="#all"/>
+    <xsl:template match="div[not(descendant::table)]" mode="#all"/>
 </xsl:stylesheet>