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
      RenderInline {span} at (0,0) size 122x14 [color=#008000]
        RenderText {#text} at (0,0) size 122x14
          text run at (0,0) width 122: "This line should be green."
=======
layer at (0,0) size 800x51
  RenderBlock {test} at (0,0) size 800x51
    RenderBlock {p} at (0,16) size 800x19
      RenderInline {span} at (0,0) size 163x19 [color=#008000]
        RenderText {#text} at (0,0) size 163x19
          text run at (0,0) width 163: "This line should be green."
>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d