start merging in emily's section
merge in Emily's section