diff --git a/internal/tools/bbxt/bbxt_test.go b/internal/tools/bbxt/bbxt_test.go
index 96ac36d..1bde483 100644
--- a/internal/tools/bbxt/bbxt_test.go
+++ b/internal/tools/bbxt/bbxt_test.go
@@ -32,11 +32,7 @@ func Test_StatisOursProductLossSumApiTotal(t *testing.T) {
 	if err != nil {
 		panic(err)
 	}
-<<<<<<< HEAD
-	o, err := NewBbxtTools(nil)
-=======
 	o, err := NewBbxtTools(nil, nil)
->>>>>>> v4
 	if err != nil {
 		panic(err)
 	}
@@ -47,12 +43,8 @@ func Test_StatisOursProductLossSumApiTotal(t *testing.T) {
 }
 
 func Test_StatisOursProductLossSum(t *testing.T) {
-<<<<<<< HEAD
-	o, err := NewBbxtTools(nil)
-=======
 	run()
 	o, err := NewBbxtTools(configConfig, lsxd.NewLogin(configConfig, utils.NewRdb(configConfig)))
->>>>>>> v4
 	if err != nil {
 		panic(err)
 	}
@@ -63,11 +55,7 @@ func Test_StatisOursProductLossSum(t *testing.T) {
 }
 
 func Test_GetProfitRankingSum(t *testing.T) {
-<<<<<<< HEAD
-	o, err := NewBbxtTools(nil)
-=======
 	o, err := NewBbxtTools(nil, nil)
->>>>>>> v4
 	if err != nil {
 		panic(err)
 	}
@@ -78,11 +66,7 @@ func Test_GetProfitRankingSum(t *testing.T) {
 }
 
 func Test_GetStatisOfficialProductSumDecline(t *testing.T) {
-<<<<<<< HEAD
-	o, err := NewBbxtTools(nil)
-=======
 	o, err := NewBbxtTools(nil, nil)
->>>>>>> v4
 	if err != nil {
 		panic(err)
 	}
@@ -96,13 +80,9 @@ func Test_GetStatisOfficialProductSumDecline(t *testing.T) {
 }
 
 func Test_GetStatisOfficialProductSum(t *testing.T) {
-<<<<<<< HEAD
-	o, err := NewBbxtTools(nil)
-=======
 
 	configs := configConfig
 	o, err := NewBbxtTools(nil, lsxd.NewLogin(configs, utils.NewRdb(configConfig)))
->>>>>>> v4
 	if err != nil {
 		panic(err)
 	}