angle from velocity, need to adjust velocity acordingly
merge errors