saving server.js
resolved conflict