diff --git a/executor/jointest/BUILD.bazel b/executor/jointest/BUILD.bazel
index 1cd17bdac681f..c4b729a28137b 100644
--- a/executor/jointest/BUILD.bazel
+++ b/executor/jointest/BUILD.bazel
@@ -9,11 +9,7 @@ go_test(
     ],
     flaky = True,
     race = "on",
-<<<<<<< HEAD:executor/jointest/BUILD.bazel
     shard_count = 50,
-=======
-    shard_count = 30,
->>>>>>> af04707eda7 (*: fix data race in ProcessInfo (#45127)):executor/test/indexmergereadtest/BUILD.bazel
     deps = [
         "//config",
         "//meta/autoid",
diff --git a/util/util.go b/util/util.go
index 88c078837574d..3e54054514b69 100644
--- a/util/util.go
+++ b/util/util.go
@@ -153,21 +153,12 @@ func GenLogFields(costTime time.Duration, info *ProcessInfo, needTruncateSQL boo
 		logFields = append(logFields, zap.String("database", info.DB))
 	}
 	var tableIDs, indexNames string
-<<<<<<< HEAD
-	if len(info.StmtCtx.TableIDs) > 0 {
-		tableIDs = strings.Replace(fmt.Sprintf("%v", info.StmtCtx.TableIDs), " ", ",", -1)
-		logFields = append(logFields, zap.String("table_ids", tableIDs))
-	}
-	if len(info.StmtCtx.IndexNames) > 0 {
-		indexNames = strings.Replace(fmt.Sprintf("%v", info.StmtCtx.IndexNames), " ", ",", -1)
-=======
 	if len(info.TableIDs) > 0 {
-		tableIDs = strings.ReplaceAll(fmt.Sprintf("%v", info.TableIDs), " ", ",")
+		tableIDs = strings.Replace(fmt.Sprintf("%v", info.TableIDs), " ", ",", -1)
 		logFields = append(logFields, zap.String("table_ids", tableIDs))
 	}
 	if len(info.IndexNames) > 0 {
-		indexNames = strings.ReplaceAll(fmt.Sprintf("%v", info.IndexNames), " ", ",")
->>>>>>> af04707eda7 (*: fix data race in ProcessInfo (#45127))
+		indexNames = strings.Replace(fmt.Sprintf("%v", info.IndexNames), " ", ",", -1)
 		logFields = append(logFields, zap.String("index_names", indexNames))
 	}
 	logFields = append(logFields, zap.Uint64("txn_start_ts", info.CurTxnStartTS))