removed a console.log in server.js
fix merge conflict on server.js