resolve conflict with main

Author: curiecrypt

mithril-stm/src/protocol/aggregate_signature/signature.rs

@@ -1,9 +1,7 @@
-use std::{collections::HashMap, fmt::Display, hash::Hash, str::FromStr};
-
 use anyhow::anyhow;
 use blake2::digest::{Digest, FixedOutput};
 use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, fmt::Display, hash::Hash};
+use std::{collections::HashMap, fmt::Display, hash::Hash, str::FromStr};
 
 use super::AggregateVerificationKey;
 use crate::{