diff --git a/go.mod b/go.mod
index f9e1b100ca0..4975787028f 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,11 @@ require (
 	github.com/TykTechnologies/drl v0.0.0-20221208085827-9bc9b4338f26
 	github.com/TykTechnologies/goautosocket v0.0.0-20190430121222-97bfa5e7e481
 	github.com/TykTechnologies/gojsonschema v0.0.0-20170222154038-dcb3e4bb7990
+<<<<<<< HEAD
 	github.com/TykTechnologies/gorpc v0.0.0-20210624160652-fe65bda0ccb9
+=======
+	github.com/TykTechnologies/gorpc v0.0.0-20241016124253-606484472fbb
+>>>>>>> 8f37f4bc9... TT-13130 update gorpc version (#6644)
 	github.com/TykTechnologies/goverify v0.0.0-20220808203004-1486f89e7708
 	github.com/TykTechnologies/graphql-go-tools v1.6.2-0.20240201085637-06899f14ba13
 	github.com/TykTechnologies/leakybucket v0.0.0-20170301023702-71692c943e3c
diff --git a/go.sum b/go.sum
index 1c7cbd8491e..1dd5ac04aae 100644
--- a/go.sum
+++ b/go.sum
@@ -65,8 +65,13 @@ github.com/TykTechnologies/goautosocket v0.0.0-20190430121222-97bfa5e7e481 h1:fP
 github.com/TykTechnologies/goautosocket v0.0.0-20190430121222-97bfa5e7e481/go.mod h1:CtF8OunV123VfKa8Z9kKcIPHgcd67hSAwFMLlS7FvS4=
 github.com/TykTechnologies/gojsonschema v0.0.0-20170222154038-dcb3e4bb7990 h1:CJRTgg13M3vJG9S7k7kpnvDRMGMywm5OsN6eUE8VwJE=
 github.com/TykTechnologies/gojsonschema v0.0.0-20170222154038-dcb3e4bb7990/go.mod h1:SQT0NBrY4/pMikBgwFIrWCjcHBxg015Y8is0kAnMtug=
+<<<<<<< HEAD
 github.com/TykTechnologies/gorpc v0.0.0-20210624160652-fe65bda0ccb9 h1:fbxHiuw/244CQ4TEirzgL/CIMXDUx2szZn8cuuMlCy0=
 github.com/TykTechnologies/gorpc v0.0.0-20210624160652-fe65bda0ccb9/go.mod h1:v6v7Mlj08+EmEcXOfpuTxGt2qYU9yhqqtv4QF9Wf50E=
+=======
+github.com/TykTechnologies/gorpc v0.0.0-20241016124253-606484472fbb h1:4ZQmRdKvOgE/KSlwT7Ze/imlWaC/z9kynUL4lADCz3Y=
+github.com/TykTechnologies/gorpc v0.0.0-20241016124253-606484472fbb/go.mod h1:v6v7Mlj08+EmEcXOfpuTxGt2qYU9yhqqtv4QF9Wf50E=
+>>>>>>> 8f37f4bc9... TT-13130 update gorpc version (#6644)
 github.com/TykTechnologies/goverify v0.0.0-20220808203004-1486f89e7708 h1:cmXjlMzcexhc/Cg+QB/c2CPUVs1ux9xn6162qaf/LC4=
 github.com/TykTechnologies/goverify v0.0.0-20220808203004-1486f89e7708/go.mod h1:mkS8jKcz8otdfEXhJs1QQ/DKoIY1NFFsRPKS0RwQENI=
 github.com/TykTechnologies/graphql-go-tools v1.6.2-0.20230320143102-7a16078ce517/go.mod h1:ZiFZcrue3+n2mHH+KLHRipbYVULkgy3Myko5S7IIs74=
diff --git a/rpc/rpc_client.go b/rpc/rpc_client.go
index f1870ebe061..2fcac9e7b73 100644
--- a/rpc/rpc_client.go
+++ b/rpc/rpc_client.go
@@ -313,7 +313,11 @@ func Connect(connConfig Config, suppressRegister bool, dispatcherFuncs map[strin
 	}
 
 	// wait until all the pool connections are dialed so we can call login
+<<<<<<< HEAD
 	connectionDialingWG.Wait()
+=======
+	clientSingleton.WaitForConnection()
+>>>>>>> 8f37f4bc9... TT-13130 update gorpc version (#6644)
 	handleLogin()
 	if !suppressRegister {
 		register()