fix merge conflicts

core/storage/btree.rs

@@ -4232,7 +4232,7 @@ impl BTreeCursor {
                     let record = record.as_ref().unwrap();
                     let record_same_number_cols = &record.get_values()[..key_values.len()];
                     compare_immutable(
-                        key_values,
+                        key_values.as_slice(),
                         record_same_number_cols,
                         self.key_sort_order(),
                         &self.collations,

core/types.rs

@@ -994,6 +994,10 @@ impl ImmutableRecord {
         }
     }
 
+    pub fn as_blob_value(&self) -> &Value {
+        &self.payload
+    }
+
     pub fn start_serialization(&mut self, payload: &[u8]) {
         self.as_blob_mut().extend_from_slice(payload);
     }

core/vdbe/mod.rs

@@ -606,25 +606,6 @@ pub fn registers_to_ref_values(registers: &[Register]) -> Vec<RefValue> {
         .collect()
 }
 
-pub fn registers_to_ref_values(registers: &[Register]) -> Vec<RefValue> {
-    registers
-        .iter()
-        .map(|reg| {
-            let value = reg.get_owned_value();
-            match value {
-                Value::Null => RefValue::Null,
-                Value::Integer(i) => RefValue::Integer(*i),
-                Value::Float(f) => RefValue::Float(*f),
-                Value::Text(t) => RefValue::Text(TextRef {
-                    value: RawSlice::new(t.value.as_ptr(), t.value.len()),
-                    subtype: t.subtype.clone(),
-                }),
-                Value::Blob(b) => RefValue::Blob(RawSlice::new(b.as_ptr(), b.len())),
-            }
-        })
-        .collect()
-}
-
 #[instrument(skip(program), level = Level::INFO)]
 fn trace_insn(program: &Program, addr: InsnReference, insn: &Insn) {
     if !tracing::enabled!(tracing::Level::TRACE) {