[css-syntax] resolve conflicts

Author: tabatkins

css-grid/Overview.html

@@ -490,11 +490,7 @@ <h2 class="heading settled heading" data-level=2 id=grid-concepts><span class=se
 		along the <a href=http://www.w3.org/TR/css3-writing-modes/#inline-axis>inline axis</a> (the <dfn data-dfn-type=dfn data-export="" id=row-axis>row axis<a class=self-link href=#row-axis></a></dfn>).
 		<a data-biblio-type=normative data-link-type=biblio href=#css3-writing-modes title=css3-writing-modes>[CSS3-WRITING-MODES]</a>
 
-<div class=figure>
-		<img alt="Image: A diagram illustrating the relationship between the Grid Element and its Tracks, Lines, Areas and Items." class=figure src=images/grid-concepts.png>
-		<p class=caption>A diagram illustrating the relationship between the <a data-link-type=dfn href=#grid-container title="grid container">grid container</a> and its tracks, lines, areas and items.
-	</div>
---&gt;
+
 
 	<div class=figure>
 		<img alt="Image: Grid Lines." class=figure src=images/grid-lines.png>