diff --git a/star_lock/lib/common/XSConstantMacro/XSConstantMacro.dart b/star_lock/lib/common/XSConstantMacro/XSConstantMacro.dart
index b54a6952..6d33a295 100644
--- a/star_lock/lib/common/XSConstantMacro/XSConstantMacro.dart
+++ b/star_lock/lib/common/XSConstantMacro/XSConstantMacro.dart
@@ -19,7 +19,6 @@ class XSConstantMacro {
   static int keyTypeOnce = 3;
   static int keyTypeLoop = 4;
 
-<<<<<<< HEAD
   // "110401" 正常使用
   // "110402" 待接收
   // "110403" 待生效
@@ -55,12 +54,10 @@ class XSConstantMacro {
         return "未知";
     }
   }
-=======
   // 门锁事件类型 lockEventType 事件类型：0-全部事件；10-开门事件20-异常事件30-门铃事件40-视频事件
   static int lockEventTypeAll = 0;
   static int lockEventTypeOpenDoor = 10;
   static int lockEventTypeAbnormal = 20;
   static int lockEventTypeDoorbell = 30;
   static int lockEventTypeVideo = 40;
->>>>>>> 3a8faadfc9fb60336af1b9ad2319bd9f1c70c714
 }