Calibration done
Fixed merge conflict