Fixed server.js from merge connflict