Change conflict
Fixed bugs HW6