merging with local repo