add velo
fixing conflicts