work on routes, contorller
fix merge conflicts