make consistent routes
merge conflicts