rebuild from rebase