fixed routes
Merge branch 'kiope'
updated merge conflict