added add_route
fixed conflicts