Rebase so it's not a fork