added content type for web.js response
fixed merge