fix conflict in javascript
Merge remote-tracking branch 'origin/HeyAlmer'