added routes
fix merge conflicts