changed some routes
resolved conflicts