added a <p>
resolved conflict