Worked on section 2
merged diffed
diffed