resolbed fetch and rebase