fix cargo file

Author: ghubertpalo

Cargo.lock

@@ -16,11 +16,8 @@ hex = "0.4.3"
 http = "0.2.6"
 jsonschema = "0.12.2"
 mithril = { path = "../mithril-core" }
-<<<<<<< HEAD
 mockall = "0.11.0"
-=======
 nom = "7.1"
->>>>>>> fix warnings
 rand_chacha = "0.3.1"
 rand_core   = "0.6.3"
 serde = { version = "1.0", features = ["derive"] }