- fix merge error with calibration