fixing conflicts
add velo
add velo