Merging master repo with local repo