resolved fetch and rebase