Fixed merge errors in the Server.js file