In the earlier mockups the boxes for conflicting paragraphs had white space included unless they reached a certain heights.
 The heights of a box in an edit conflict is defined by the text it surrounds. There should be no white space inside the box (that isn't part of the text), as this could be misinterpreted as empty lines. Instead we have more whitespace between the boxes, preferably to the top on the small boxes.
 If the box is too small for the radio button + explanatory text to fit in between, the radio buttons should be horizontally centered with the boxes.
 If the box is big enough for radio buttons + explanatory text, they are aligned with the top as right now
See the mockup below