layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
+<<<<<<< HEAD
layer at (0,0) size 800x38
RenderBlock {test} at (0,0) size 800x38
RenderBlock {p} at (0,12) size 800x14 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 412x14
text run at (0,0) width 412: "This paragraph should have a green background because its title attribute contains \"bar\""
+=======
+layer at (0,0) size 800x51
+ RenderBlock {test} at (0,0) size 800x51
+ RenderBlock {p} at (0,16) size 800x19 [bgcolor=#00FF00]
+ RenderText {#text} at (0,0) size 552x19
+ text run at (0,0) width 552: "This paragraph should have a green background because its title attribute contains \"bar\""
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d