calibrate
fixed conflicts
merged