urlParser update

updated server.js: removed conflicts