From db5cd70c77651cb2f01bfd3f5b94b64ca3dec22b Mon Sep 17 00:00:00 2001
From: "Carol (Nichols || Goulding)" <carol.nichols@gmail.com>
Date: Tue, 29 Mar 2022 08:29:23 -0400
Subject: [PATCH] fix: logical merge conflict, unused import

---
 compactor/src/compact.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compactor/src/compact.rs b/compactor/src/compact.rs
index 2ecd18ad01..5c7370ba24 100644
--- a/compactor/src/compact.rs
+++ b/compactor/src/compact.rs
@@ -868,7 +868,7 @@ mod tests {
     use arrow_util::assert_batches_sorted_eq;
     use data_types2::{KafkaPartition, NamespaceId, ParquetFileParams, SequenceNumber};
     use iox_tests::util::TestCatalog;
-    use object_store::{path::Path, ObjectStoreTestConvenience};
+    use object_store::ObjectStoreTestConvenience;
     use querier::{
         cache::CatalogCache,
         chunk::{collect_read_filter, ParquetChunkAdapter},