merge conflict - server.js had added route