merge js fix