lab3-merged