[css-flexbox] Ugh, resolve conflict.

Author: tabatkins

css-flexbox/Overview.bs

@@ -1732,11 +1732,7 @@ Cross-axis Alignment: the 'align-items' and 'align-self' properties</h3>
 	<p>
 		A value of <dfn value for=align-self>auto</dfn> for 'align-self'
 		computes to the value of 'align-items' on the element’s parent,
-<<<<<<< local
-		or <a value for=align-self>stretch</a> if the element has no parent.
-=======
 		or ''align-self/stretch'' if the element has no parent.
->>>>>>> other
 		The alignments are defined as:
 
 	<dl dfn-type=value dfn-for="align-items align-self">

css-flexbox/Overview.html

@@ -1752,11 +1752,7 @@ <h3 class="heading settled heading" data-level=8.3 id=align-items-property><span
 	<p>
 		A value of <dfn class=css-code data-dfn-for=align-self data-dfn-type=value data-export="" id=valuedef-auto>auto<a class=self-link href=#valuedef-auto></a></dfn> for <a class=property data-link-type=propdesc href=#propdef-align-self title=align-self>align-self</a>
 		computes to the value of <a class=property data-link-type=propdesc href=#propdef-align-items title=align-items>align-items</a> on the element’s parent,
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; local
-		or <a class=css-code data-link-for=align-self data-link-type=value href=#valuedef-stretch0 title=stretch>stretch</a> if the element has no parent.
-=======
 		or <a class=css data-link-for=align-self data-link-type=maybe href=#valuedef-stretch0 title=stretch>stretch</a> if the element has no parent.
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; other
 		The alignments are defined as:
 
 	<dl data-dfn-for="align-items align-self" data-dfn-type=value>