misc: fix merge conflict

Cargo.lock

@@ -659,6 +659,12 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "colorful"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb474a9c3219a8254ead020421ecf1b90427f29b55f6aae9a2471fa62c126ef"
+
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -903,6 +909,16 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
+[[package]]
+name = "dsa_editor"
+version = "0.1.0"
+dependencies = [
+ "colorful",
+ "eframe",
+ "egui",
+ "serde",
+]
+
 [[package]]
 name = "ecolor"
 version = "0.31.1"