fix versions

Cargo.toml

@@ -17,19 +17,6 @@ Note:
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-<<<<<<< HEAD
-rust-htslib = "0.40.2"
-#regex = "1"
-clap = "4.1.6"
-csv = "1.2.0"
-chrono = "0.4.23"
-bio = "1.1.0"
-itertools = "*"
-bambam = {git = "https://github.com/ebioman/bambam"}
-crossbeam = "0.8.2"
-crossbeam-channel = "0.5.6"
-rayon = "1.6.1"
-=======
 rust-htslib = { version = "0.46.0", default-features = false }
 #regex = "1"
 log = "0.4.22"
@@ -43,4 +30,3 @@ bambam = {git = "https://github.com/ebioman/bambam"}
 crossbeam = "0.8.4"
 crossbeam-channel = "*"
 rayon = "1.10.0"
->>>>>>> dev