From 7227ae1c8ef1f74e180f324185d01f564730af70 Mon Sep 17 00:00:00 2001
From: Anthony Laibe <491074+alaibe@users.noreply.github.com>
Date: Tue, 24 May 2022 12:57:45 +0200
Subject: [PATCH] fix: merge node config allows overide (#2664)

---
 account/accounts_geth.go | 1 +
 api/geth_backend.go      | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/account/accounts_geth.go b/account/accounts_geth.go
index 0bd25569a..9bc6afe41 100644
--- a/account/accounts_geth.go
+++ b/account/accounts_geth.go
@@ -30,6 +30,7 @@ func (m *GethManager) InitKeystore(keydir string) error {
 	if err != nil {
 		return err
 	}
+
 	m.keystore, err = makeKeyStore(m.gethAccManager)
 	return err
 }
diff --git a/api/geth_backend.go b/api/geth_backend.go
index dbf1ca6f7..3f0f9a01d 100644
--- a/api/geth_backend.go
+++ b/api/geth_backend.go
@@ -358,8 +358,7 @@ func (b *GethStatusBackend) StartNodeWithKey(acc multiaccounts.Account, password
 }
 
 func (b *GethStatusBackend) OverwriteNodeConfigValues(conf *params.NodeConfig, n *params.NodeConfig) (*params.NodeConfig, error) {
-	// Overwrite db configuration (only adds new values)
-	if err := mergo.Merge(conf, n); err != nil {
+	if err := mergo.Merge(conf, n, mergo.WithOverride); err != nil {
 		return nil, err
 	}