layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
+<<<<<<< HEAD
layer at (0,0) size 800x90
RenderBlock {test} at (0,0) size 800x90
RenderBlock {p} at (0,12) size 800x14 [bgcolor=#00FF00]
RenderBlock {r} at (0,64) size 800x14 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 227x14
text run at (0,0) width 227: "This paragraph should have a green background"
+=======
+layer at (0,0) size 800x121
+ RenderBlock {test} at (0,0) size 800x121
+ RenderBlock {p} at (0,16) size 800x19 [bgcolor=#00FF00]
+ RenderText {#text} at (0,0) size 304x19
+ text run at (0,0) width 304: "This paragraph should have a green background"
+ RenderBlock {q} at (0,51) size 800x19
+ RenderText {#text} at (0,0) size 221x19
+ text run at (0,0) width 221: "This paragraph should be unstyled."
+ RenderBlock {r} at (0,86) size 800x19 [bgcolor=#00FF00]
+ RenderText {#text} at (0,0) size 304x19
+ text run at (0,0) width 304: "This paragraph should have a green background"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d