diff --git a/shared/consts/constModules/sysConst.ts b/shared/consts/constModules/sysConst.ts
index f1704b43a..e023ec868 100644
--- a/shared/consts/constModules/sysConst.ts
+++ b/shared/consts/constModules/sysConst.ts
@@ -386,14 +386,8 @@ export enum POPULATE_TYPE {
 }
 
 export enum BLOCK_OPEATE {
-<<<<<<< HEAD
   ADD = 1,
   REMOVE_BLACK = 2,
   REMOVE_AND_APPLY = 3,
   REMOVE_FRIEND = 4
-=======
-    ADD = 1,
-    REMOVE = 2,
-    REMOVE_AND_APPLY = 3
->>>>>>> cf60d7c... 邮件 活跃度下发
 }
\ No newline at end of file