wrote a section 2 draft
resolved a small conflict