Fix conflicts

Author: tabatkins

css-flexbox/Overview.bs

@@ -254,7 +254,7 @@ Overview</h3>
 			can be laid out in any <a href="#flex-direction-property">flow direction</a>
 			(leftwards, rightwards, downwards, or even upwards!)
 		<li>
-			can have their display order <a href="#valuedef-row-reverse">reversed</a> or
+			can have their display order <a href="#valdef-flex-direction-row-reverse">reversed</a> or
 			<a href="#order-property">rearranged</a> at the style layer
 			(i.e., visual order can be independent of source and speech order)
 		<li>
@@ -658,19 +658,21 @@ Absolutely-Positioned Flex Children</h3>
 
 	<hr>
 
-	If the <dfn>static-position box</dfn> were conceived of as a rectangle,
-	usually (i.e. in block layout) corresponding to
-	the position of the “hypothetical box” described in
-	<a href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width">CSS2.1&sect;10.3.7</a>
-	and used to determine the static-position offsets
-	by assuming a <i>block-start</i> <i>inline-start</i> alignment
-	of the absolutely-positioned box within the <i>static-position box</i>,
-	then this is equivalent to
-	choosing the <i>flex container</i>’s padding box as the <i>static-position box</i>
-	and determining the static-position offsets by aligning
-	the absolutely-positioned child within the <i>static-position box</i>
-	using the 'justify-content' value of the <i>flex container</i>
-	and the 'align-self' value of the absolutely-positioned item itself.
+	<div class='note'>
+		This belongs in Position,
+		but assume that the <dfn>static position</dfn> of a box
+		is a rectangle,
+		usually (i.e. in block layout) corresponding to
+		the position of the “hypothetical box” described in
+		<a href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width">CSS2.1§10.3.7</a>.
+		The abspos is then aligned within this rectangle by applying 'top'/etc offsets,
+		then, by default, aligning it to the <a>block-start</a> <a>inline-start</a> corner.
+	</div>
+
+	The <a>static position</a> of an absolutely positioned child of a <a>flex container</a>
+	is determined by setting the <a>static position</a> rectangle to the <a>flex container's</a> padding box,
+	then aligning the child within this rectangle according to the 'justify-content' value of the <a>flex container</a>
+	and the 'align-self' value of the child itself.
 
 	<div class='example'>
 		The effect of this is that if you set, for example,
@@ -1712,7 +1714,7 @@ The 'flex-basis' property</h4>
 		</dl>
 
 		The CSSWG is waiting for feedback from implementers on this issue.
-		
+
 		<small><sup>1</sup> Alternate keyword suggestions welcome.</small>
 		<small><sup>1</sup> Alternate keyword suggestions welcome.</small>
 	</div>
@@ -3356,7 +3358,7 @@ Changes since the 25 March 2014 LCWD</h3>
 		(Issue <a href="http://dev.w3.org/csswg/css-flexbox-1/issues-lc-20140325#issue-26">26</a>)
 		(Issue <a href="http://dev.w3.org/csswg/css-flexbox-1/issues-lc-20140325#issue-27">27</a>)
 		(Issue <a href="http://dev.w3.org/csswg/css-flexbox-1/issues-lc-20140325#issue-28">28</a>)
-		
+
 	</ul>
 
 	A <a href="http://dev.w3.org/csswg/css3-flexbox/issues-lc-20140325/">Disposition of Comments</a> is available.