week1 merge