fix conflicts

src/storage/hummock_trace/src/collector.rs

@@ -473,6 +473,7 @@ mod tests {
                             table_option: TracedTableOption {
                                 retention_seconds: None,
                             },
+                            is_replicated: false,
                         },
                     ),
                 );

src/storage/hummock_trace/src/opts.rs

@@ -134,6 +134,7 @@ pub struct TracedNewLocalOptions {
     pub table_id: TracedTableId,
     pub is_consistent_op: bool,
     pub table_option: TracedTableOption,
+    pub is_replicated: bool,
 }
 
 pub type TracedHummockEpoch = u64;

src/storage/src/store.rs

@@ -420,6 +420,7 @@ impl From<TracedNewLocalOptions> for NewLocalOptions {
             table_id: value.table_id.into(),
             is_consistent_op: value.is_consistent_op,
             table_option: value.table_option.into(),
+            is_replicated: value.is_replicated,
         }
     }
 }