diff --git a/main.c b/main.c
index af57140..b65daea 100644
--- a/main.c
+++ b/main.c
@@ -3,7 +3,11 @@
 #include "keyFSM.h"
 #include "FSM_public.h"
 
+<<<<<<< HEAD
 #define     NUM     60
+=======
+#define     NUM     50
+>>>>>>> isLastHolding没初始化
 // KeyIn testin[NUM] = {
 //     Up,Up,Up,Up,Up,                     Up,pDown,pDown,pDown,Up,        pDown,pDown,pDown,pDown,pDown, 
 //     pDown,pDown,pDown,Up,Up,            pDown,pDown,
@@ -11,10 +15,15 @@
 
 KeyIn testin[NUM] = {
     Up,Up,pDown,pDown,Up,               
+<<<<<<< HEAD
     pDown,pDown,pDown,pDown,pDown, 
     pDown,pDown,pDown,pDown,pDown, 
     Up,Up,Up,Up,Up,
     pDown,pDown,pDown,pDown,pDown, 
+=======
+    pDown,pDown,pDown,pDown,pDown,        
+    pDown,pDown,pDown,Up,Up, 
+>>>>>>> isLastHolding没初始化
     pDown,pDown,pDown,pDown,pDown, 
     pDown,pDown,pDown,pDown,pDown, 
     pDown,pDown,pDown,pDown,pDown,