Fixed conflict messages in coman motor_params_torso.xml