changed routes
merged routes