Part3 week1 merge