Merge with the original repository