Routes.js merge

I messed up on file during merge, my bad