fix broken merge js