From c2e46f1c5b30bdadd3cf752395c47734eae8795e Mon Sep 17 00:00:00 2001
From: Lukasz Antoniak <Lukasz.Antoniak@gmail.com>
Date: Thu, 11 Jul 2024 11:29:39 +0200
Subject: [PATCH] Fix merge issues

---
 proxy/pkg/config/config_test.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/proxy/pkg/config/config_test.go b/proxy/pkg/config/config_test.go
index 3e5ab34..74eaa55 100644
--- a/proxy/pkg/config/config_test.go
+++ b/proxy/pkg/config/config_test.go
@@ -107,7 +107,9 @@ func TestTargetConfig_ParsingControlConnMaxProtocolVersion(t *testing.T) {
 	// test-specific setup
 	setTargetContactPointsAndPortEnvVars()
 
-	conf := New().parseEnvVars()
+	conf := New()
+	err := conf.parseEnvVars()
+	require.Nil(t, err)
 
 	tests := []struct {
 		name                          string