Fixing merge error in PID values