Updated thru sec 3
resolved conflict