added paragraphs
resolve conflicts