changing javascript
merging style conflicts