added my own paragraph
we resolved a conflict