Merging for week 2