added web changes
fixed merge