fixing my git repo my merging week 1 to week 2