fix rebase conflict

node/node.go

@@ -165,7 +165,7 @@ func makeNode(
 	}
 
 	// Check app version is matched with the genesis file.
-	appInfo, err := proxyApp.Query().Info(ctx, abci.RequestInfo{Version: ""})
+	appInfo, err := proxyApp.Info(ctx, abci.RequestInfo{Version: ""})
 	if err != nil {
 		return nil, fmt.Errorf("error query app info: %w", err)
 	}

node/node_test.go

@@ -773,7 +773,8 @@ func TestNodeAppVersionNotMatched(t *testing.T) {
 
 	logger := log.NewNopLogger()
 
-	appClient, _ := proxy.DefaultClientCreator(logger, cfg.ProxyApp, cfg.ABCI, cfg.DBDir())
+	appClient, _, err := proxy.ClientFactory(logger, cfg.ProxyApp, cfg.ABCI, cfg.DBDir())
+	require.NoError(t, err)
 
 	genesisDoc, err := types.GenesisDocFromFile(cfg.GenesisFile())
 	require.NoError(t, err)