put routes stuff
fix conflict