new paragraph
merge conflict