Vector Casting

Signed-off-by: Nicholas Gates <[email protected]>

Author: gatesn

vortex-vector/src/primitive/generic.rs

@@ -12,11 +12,7 @@ use vortex_error::{vortex_ensure, VortexExpect, VortexResult};
 use vortex_mask::Mask;
 
 use crate::primitive::{PScalar, PVectorMut};
-<<<<<<< Updated upstream
 use crate::{Scalar, VectorOps};
-=======
-use crate::VectorOps;
->>>>>>> Stashed changes
 
 /// An immutable vector of generic primitive values.
 ///