playing again with javascript
fix merge conflict