working on lab3
merge