merging with local copy