more js fixes
fixes merge conflicts