merge remote with local for week 5