merge to lab2