cleaned up routes
fixed merge conflict