fix: rebase conflict

libs/hbb_common/src/config.rs

@@ -1,3 +1,8 @@
+use crate::log;
+use directories_next::ProjectDirs;
+use rand::Rng;
+use serde_derive::{Deserialize, Serialize};
+use sodiumoxide::crypto::sign;
 use std::{
     collections::HashMap,
     fs,