rebase 2 demo
resolved fetch and rebase