fix conflict

Author: grtlr

Cargo.lock

@@ -5698,6 +5698,17 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
+[[package]]
+name = "lenses"
+version = "0.26.0-alpha.1+dev"
+dependencies = [
+ "anyhow",
+ "arrow",
+ "clap",
+ "insta",
+ "rerun",
+]
+
 [[package]]
 name = "levenshtein_automata"
 version = "0.2.1"