diff --git a/vortex-serde/src/chunked_reader/take_rows.rs b/vortex-serde/src/chunked_reader/take_rows.rs
index 85a9b1489b..792d0e72e1 100644
--- a/vortex-serde/src/chunked_reader/take_rows.rs
+++ b/vortex-serde/src/chunked_reader/take_rows.rs
@@ -4,14 +4,13 @@ use std::ops::Range;
 use bytes::BytesMut;
 use futures_util::{stream, StreamExt, TryStreamExt};
 use itertools::Itertools;
-
-use vortex::{Array, ArrayDType, IntoArray, IntoArrayVariant};
 use vortex::array::chunked::ChunkedArray;
 use vortex::array::primitive::PrimitiveArray;
-use vortex::compute::{search_sorted, SearchResult, SearchSortedSide, slice, take};
 use vortex::compute::unary::{subtract_scalar, try_cast};
+use vortex::compute::{search_sorted, slice, take, SearchResult, SearchSortedSide};
 use vortex::stats::ArrayStatistics;
 use vortex::stream::{ArrayStream, ArrayStreamExt};
+use vortex::{Array, ArrayDType, IntoArray, IntoArrayVariant};
 use vortex_dtype::PType;
 use vortex_error::{vortex_bail, VortexResult};
 use vortex_scalar::Scalar;
@@ -209,17 +208,16 @@ mod test {
 
     use futures_executor::block_on;
     use itertools::Itertools;
-
-    use vortex::{Context, IntoArray, IntoArrayVariant};
     use vortex::array::chunked::ChunkedArray;
     use vortex::array::primitive::PrimitiveArray;
+    use vortex::{Context, IntoArray, IntoArrayVariant};
     use vortex_buffer::Buffer;
     use vortex_dtype::PType;
     use vortex_error::VortexResult;
 
     use crate::chunked_reader::ChunkedArrayReader;
-    use crate::MessageReader;
     use crate::writer::ArrayWriter;
+    use crate::MessageReader;
 
     fn chunked_array() -> VortexResult<ArrayWriter<Vec<u8>>> {
         let c = ChunkedArray::try_new(
diff --git a/vortex-serde/src/lib.rs b/vortex-serde/src/lib.rs
index 4cfee840f0..4695d5a35a 100644
--- a/vortex-serde/src/lib.rs
+++ b/vortex-serde/src/lib.rs
@@ -77,22 +77,8 @@ mod test {
         })
     }
 
-<<<<<<< HEAD:vortex-ipc/src/lib.rs
-    async fn write_ipc<A: IntoArray>(array: A) -> Vec<u8> {
-        ArrayWriter::new(vec![])
-            .write_array(array.into_array())
-            .await
-            .unwrap()
-            .into_inner()
-    }
-
-    #[tokio::test]
-    #[cfg_attr(miri, ignore)]
-    async fn test_empty_index() -> VortexResult<()> {
-=======
     #[test]
     fn test_empty_index() -> VortexResult<()> {
->>>>>>> 7a239b3c (Add vortex file format):vortex-serde/src/lib.rs
         let data = PrimitiveArray::from((0i32..3_000_000).collect_vec());
         let buffer = write_ipc(data);