merge to lab3