git rebase, rake routes