merged lab2