Merge with original branch