Merge with original repository