diff --git a/nym-api/src/support/cli/mod.rs b/nym-api/src/support/cli/mod.rs
index 3000177dbf..dde70aa12f 100644
--- a/nym-api/src/support/cli/mod.rs
+++ b/nym-api/src/support/cli/mod.rs
@@ -122,38 +122,20 @@ pub(crate) fn build_config(args: CliArgs) -> Result<Config> {
 
     let config = override_config(config_from_file, args);
 
-<<<<<<< HEAD
-    if !_already_initialized {
-=======
     if already_initialized {
         fs::create_dir_all(Config::default_config_directory(&id))
             .expect("Could not create config directory");
         fs::create_dir_all(Config::default_data_directory(&id))
             .expect("Could not create data directory");
-
-        #[cfg(feature = "coconut")]
->>>>>>> release/v1.1.8
         crate::coconut::dkg::controller::init_keypair(&config)?;
     }
 
     Ok(config)
 }
 
-pub(crate) fn override_config(mut config: Config, args: CliArgs) -> Config {
-<<<<<<< HEAD
-    if let Some(id) = args.id {
-        fs::create_dir_all(Config::default_config_directory(Some(&id)))
-            .expect("Could not create config directory");
-        fs::create_dir_all(Config::default_data_directory(Some(&id)))
-            .expect("Could not create data directory");
-        config = config.with_id(&id);
-    }
-
+pub(crate) fn override_config(config: Config, args: CliArgs) -> Config {
     config
-=======
-    config = config
         .with_id(&args.id)
->>>>>>> release/v1.1.8
         .with_optional(Config::with_custom_nyxd_validator, args.nyxd_validator)
         .with_optional_env(
             Config::with_custom_mixnet_contract,