Fix VelocityController Merge