Merge with original fork