Fix JS errors

Semicolons are often options, but not always...
resolve conflict