seems to be working on git rebase