Change calibration parameters to ensure that amplitude is fit
Fix merge conflict