Merging with origin