fixed javascript
merged files