Add a paragraph
Fixed merge conflict