PID tuning
fix merge conflicts