resolving conflict in server.js