diff --git a/modules/hero/api_drawCardv2.go b/modules/hero/api_drawCardv2.go
index ee68e3aa5..b3412a0e5 100644
--- a/modules/hero/api_drawCardv2.go
+++ b/modules/hero/api_drawCardv2.go
@@ -35,7 +35,6 @@ func (this *apiComp) DrawCardV2(session comm.IUserSession, req *pb.HeroDrawCardR
 		strPool    []string       // 10连跨多个卡池情况
 		update     map[string]interface{}
 		normalDraw bool // 是否是普通抽
-<<<<<<< HEAD
 		drawConf   *cfg.GameDrawPoolData
 		err        error
 
@@ -69,9 +68,7 @@ func (this *apiComp) DrawCardV2(session comm.IUserSession, req *pb.HeroDrawCardR
 	}
 
 	////////////////////////////////////////////////////////
-=======
-	)
->>>>>>> 03aec7e408a1e80da7f408debda883b93b688d29
+
 	update = make(map[string]interface{})
 	cfgDraw = this.module.ModuleTools.GetGlobalConf() // 读取抽卡配置文件
 	if cfgDraw == nil {
@@ -80,7 +77,6 @@ func (this *apiComp) DrawCardV2(session comm.IUserSession, req *pb.HeroDrawCardR
 	if errdata = this.DrawCardV2Check(session, req); errdata != nil {
 		return
 	}
-<<<<<<< HEAD
 
 	drawCount = heroRecord.Count[req.DrawType] // 获取当前阵容抽卡次数
 	if req.DrawType == 0 {                     // 普通卡池抽卡
@@ -101,13 +97,7 @@ func (this *apiComp) DrawCardV2(session comm.IUserSession, req *pb.HeroDrawCardR
 	} else {
 
 	}
-=======
-	szCards = make([]string, 0)
 
-	heroRecord, _ = this.module.modelRecord.GetHeroRecord(session.GetUserId())
-	drawCount = heroRecord.Drawcount
-
->>>>>>> 03aec7e408a1e80da7f408debda883b93b688d29
 	if req.DrawType == 0 { // 普通卡池抽卡
 		normalDraw = true
 		// 获取普通抽卡池
diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go
index 5211cb767..db01391a2 100644
--- a/modules/hero/configure_comp.go
+++ b/modules/hero/configure_comp.go
@@ -392,11 +392,6 @@ func (this *configureComp) GetHeroMaxLv(star int32) int32 {
 
 	return 1
 }
-<<<<<<< HEAD
-<<<<<<< Updated upstream
-=======
-=======
->>>>>>> 03aec7e408a1e80da7f408debda883b93b688d29
 func (this *configureComp) GetHeroTalentMaxLv(heroid string) (maxlv int32) {
 	if v, err := this.GetConfigure(hero_talentbox); err == nil {
 		if configure, ok := v.(*cfg.GameTalentBox); ok {
@@ -415,11 +410,8 @@ func (this *configureComp) GetHeroDrawConfigByType(id int32) (data *cfg.GameDraw
 
 	if v, err = this.GetConfigure(hero_draw); err == nil {
 		if conf, ok := v.(*cfg.GameDrawPool); ok {
-<<<<<<< HEAD
 			if data = conf.Get(id - 1); data != nil {
-=======
-			if data = conf.Get(id); data != nil {
->>>>>>> 03aec7e408a1e80da7f408debda883b93b688d29
+
 				return
 			}
 		}
@@ -448,7 +440,3 @@ func (this *configureComp) GetHeroDrawWeightConfigById(id int32) (data *cfg.Game
 	err = comm.NewNotFoundConfErr(moduleName, hero_draw, id)
 	return
 }
-<<<<<<< HEAD
->>>>>>> Stashed changes
-=======
->>>>>>> 03aec7e408a1e80da7f408debda883b93b688d29