Commiting and fixing merge error in routes.js