diff --git a/INT63DC_6CH/Forms/FormSystemSetting.Designer.cs b/INT63DC_6CH/Forms/FormSystemSetting.Designer.cs
index 91804f9..6bd3cb4 100644
--- a/INT63DC_6CH/Forms/FormSystemSetting.Designer.cs
+++ b/INT63DC_6CH/Forms/FormSystemSetting.Designer.cs
@@ -1636,11 +1636,8 @@
         private SmartX.SmartLabel labelStaticDischargeStopperRunTime;
         private SmartX.SmartLabel labelDischargeStopperDelayTime;
         private SmartX.SmartLabel labelStaticDischargeStopperDelayTime;
-<<<<<<< HEAD
         private SmartX.SmartLabel smartLabel3;
         private SmartX.SmartLabel smartLabel2;
-=======
         private SmartX.SmartLabel labelTimeroutCount;
->>>>>>> e960ad66b5a9fb985d32b16060dfeab070187c27
     }
 }
\ No newline at end of file