This is an automated cherry-pick of pingcap#56015

Signed-off-by: ti-chi-bot <[email protected]>

Author: HuSharp

pkg/executor/internal/querywatch/query_watch.go

@@ -114,11 +114,20 @@ func setWatchOption(ctx context.Context,
 }
 
 // fromQueryWatchOptionList is used to create a QuarantineRecord with some QueryWatchOption ast nodes.
+<<<<<<< HEAD
 func fromQueryWatchOptionList(ctx context.Context, sctx, newSctx sessionctx.Context, optionList []*ast.QueryWatchOption) (*resourcegroup.QuarantineRecord, error) {
 	record := &resourcegroup.QuarantineRecord{
 		Source:    resourcegroup.ManualSource,
 		StartTime: time.Now(),
 		EndTime:   resourcegroup.NullTime,
+=======
+func fromQueryWatchOptionList(ctx context.Context, sctx, newSctx sessionctx.Context,
+	optionList []*ast.QueryWatchOption) (*runaway.QuarantineRecord, error) {
+	record := &runaway.QuarantineRecord{
+		Source:    runaway.ManualSource,
+		StartTime: time.Now().UTC(),
+		EndTime:   runaway.NullTime,
+>>>>>>> 1dc045fa1a2 (runaway: change `QUERY WATCH` time type to UTC (#56015))
 	}
 	for _, op := range optionList {
 		if err := setWatchOption(ctx, sctx, newSctx, record, op); err != nil {