diff --git a/client/config/config.go b/client/config/config.go
index f9e48c989d88..d28a7a145854 100644
--- a/client/config/config.go
+++ b/client/config/config.go
@@ -56,7 +56,11 @@ func ReadFromClientConfig(ctx client.Context) (client.Context, error) {
 	configFilePath := filepath.Join(configPath, "client.toml")
 	conf := defaultClientConfig()
 
+<<<<<<< HEAD
 	// if config.toml file does not exist we create it and write default ClientConfig values into it.
+=======
+	// when client.toml does not exist create and init with default values
+>>>>>>> 01b8be0c8 (fix: typo in comment (#17635))
 	if _, err := os.Stat(configFilePath); os.IsNotExist(err) {
 		if err := ensureConfigPath(configPath); err != nil {
 			return ctx, fmt.Errorf("couldn't make client config: %v", err)