working on lab 3
merge