Jh rebase with original