Merging with Remote