fixed routes
merge conflicts