javascript
merging changes