fix: resolve conflicts

hrp/pkg/uixt/popups.go

@@ -1,10 +1,9 @@
 package uixt
 
 import (
-	"math/rand"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
+	"math/rand"
 
 	"github.com/httprunner/httprunner/v4/hrp/internal/code"
 )
@@ -91,6 +90,9 @@ type PopupInfo struct {
 	*ClosePopupsResult
 	CloseStatus string   `json:"close_status"`           // found/success/fail
 	ClosePoints []PointF `json:"close_points,omitempty"` // CV 识别的所有关闭按钮（仅关闭按钮，可能存在多个）
+	RetryCount  int      `json:"retry_count"`
+	PicName     string   `json:"pic_name"`
+	PicURL      string   `json:"pic_url"`
 }
 
 func (p *PopupInfo) getClosePoint(lastPopup *PopupInfo) (*PointF, error) {