Manually re-merge user js
edit comment
Merge pull request #1131 from JeffPyeBrook/pr-js-remerge

Manually re-merge javascript file