Merging with the original repository