put routes in alphabetical order
fixed merge conflict