tried git rebase