fix routing after rebase