Some changes in server.js
Fixed conflicts