diff --git a/dbstruct/zonemoment.go b/dbstruct/zonemoment.go
index 0cddab4d..0ee8363b 100644
--- a/dbstruct/zonemoment.go
+++ b/dbstruct/zonemoment.go
@@ -120,7 +120,6 @@ func (p *ZoneMoment) GetPaidText() string {
 	return ""
 }
 
-<<<<<<< HEAD
 type ZoneMomentStatInfo struct {
 	Mid   *int64 `json:"id" bson:"_id"`      // mid
 	Count *int64 `json:"count" bson:"count"` // count