Adding js
Fixing merge