diff --git a/js/handle.js b/js/handle.js
index e5e1977..2c577ee 100644
--- a/js/handle.js
+++ b/js/handle.js
@@ -179,7 +179,14 @@ function receiveMessage(event)
         leaderInfo = highList[0]
     }
 	// leaderInfo = '内有猛犬小心'
+<<<<<<< HEAD
 	// leaderInfo = '饺子吃肉肉'
+=======
+<<<<<<< HEAD
+	leaderInfo = '饺子吃肉肉'
+=======
+>>>>>>> c5fcb3d64edf80504ff6eccb40845e6e67a9b71e
+>>>>>>> 41a44859b9fcbc567c4e2c148584eb120ba9900e
     // uid是否存在 不存在则存入uidObj
     let isNew = 0
 
@@ -341,6 +348,19 @@ function receiveMessage(event)
 			// 	}
 			// }
 		}
+<<<<<<< HEAD
+		// 领舞喊荧光棒事件
+		// if(getLeaderFluoEvent(leader.text)!=''){
+		// 	if(firTimes==0){//防多次说话
+		// 		firTimes++;
+		// 		console.log(getLeaderFluoEvent(leader.text));
+		// 		setTimeout(()=>{
+		// 			firTimes = 0;
+		// 		},5000)
+		// 	}
+		// }
+=======
+>>>>>>> c5fcb3d64edf80504ff6eccb40845e6e67a9b71e
     }
     // -------------------- 每条弹幕处理 end -----------------------
 }