fix hpc merge jbo