fix merge for javascript