fix broken Cargo.lock after merge conflic resolution

Cargo.lock

@@ -1554,11 +1554,7 @@ dependencies = [
 
 [[package]]
 name = "joystream-node"
-<<<<<<< HEAD
 version = "2.1.5"
-=======
-version = "2.1.4"
->>>>>>> development
 dependencies = [
  "ctrlc",
  "derive_more 0.14.1",