fixed some routes
merged conflicts