merge server/routes.js