foo
b
Merge branch 'next'

* next:
  b
nnn