basic routes
fix conflicts