FIX merge javascript