diff --git a/CardSharp/GameSteps/WaitingParser.cs b/CardSharp/GameSteps/WaitingParser.cs
index 85bddd3..d9be2ca 100644
--- a/CardSharp/GameSteps/WaitingParser.cs
+++ b/CardSharp/GameSteps/WaitingParser.cs
@@ -15,16 +15,8 @@ public void Parse(Desk desk, Player player, string command)
                     var point = PlayerConfig.GetConfig(player).Point;
                     if (point <= -100000)
                         desk.AddMessage($"CNM 这里是CY 你们的印钞厂停业了.");
-<<<<<<< Updated upstream
-                    elseif (point <= 0)
+                    else if (point <= 0)
                         desk.AddMessage("您输光了/您没输入过‘获取积分’.")
-=======
-<<<<<<< HEAD
-=======
-                    elesif (point <= 0)
-                        desk.AddMessage("您输光了/您没输入过‘获取积分’.")
->>>>>>> parent of 2b21383... .
->>>>>>> Stashed changes
                     else
                         desk.AddPlayer(player);
                     break;