routes setup
fixed merge conflicts