resolve fetch and rebase