merge fix in server.js