Fix merge conflict in routes.js for CORS