fix merge conflict

Author: apolcyn

transport/control.go

@@ -51,8 +51,8 @@ const (
 	initialWindowSize       = defaultWindowSize      // for an RPC
 	initialConnWindowSize   = defaultWindowSize * 16 // for a connection
 	infinity                = time.Duration(math.MaxInt64)
-	defaultKeepaliveTime    = infinity
-	defaultKeepaliveTimeout = time.Duration(20 * time.Second)
+	defaultClientKeepaliveTime    = infinity
+	defaultClientKeepaliveTimeout = time.Duration(20 * time.Second)
 	defaultMaxStreamsClient = 100
 	defaultMaxConnectionIdle      = infinity
 	defaultMaxConnectionAge       = infinity