Updated web,js
updated web.js
fixed conflict