fixed static routes
merged