some changes in javascript
merge conflict