Fix JavaScript after bad merge