add a paragraph
Resolve conflict-h1 with a followed p