update js file locations
Fix merge conflict