unexpected blank lines in diff's name conflicts section

see delete.output.md:

.a> merge .b

  Here's what's changed in the current namespace after the
  merge:
  
  New name conflicts:
  
    1. type Foo#d97e0jhkmd
         
       ↓
    2. ┌ type Foo#d97e0jhkmd
           
    3. └ type Foo#gq9inhvg9h
           
    
    4. Foo.Foo#d97e0jhkmd#0 : Nat -> Foo#d97e0jhkmd
       ↓
    5. ┌ Foo.Foo#d97e0jhkmd#0 : Nat -> Foo#d97e0jhkmd
    6. └ Foo.Foo#gq9inhvg9h#0 : Boolean -> Foo#gq9inhvg9h
  
  Added definitions:
  
    7. foo : Nat
  
  Tip: You can use `todo` to see if this generated any work to
       do in this namespace and `test` to run the tests. Or you
       can use `undo` or `reflog` to undo the results of this
       merge.