Updating JS and other things.
Fixing merge conflict.