midsection completed
resolved conflict