fix merge error on custom js