badges routes
merge conflict