Fixed merge bug with angleAlignVelocity