Fixing JS.

There were previous merge conflicts in the file.