some changes
fix conflict of computecalibrationdb