fix merge jquery