diff --git a/src/CNShardServer.hpp b/src/CNShardServer.hpp
index 6b3b782..f180ad2 100644
--- a/src/CNShardServer.hpp
+++ b/src/CNShardServer.hpp
@@ -11,12 +11,9 @@ enum SHARDPACKETID {
     P_CL2FE_REQ_PC_LOADING_COMPLETE = 318767245,
     P_CL2FE_REP_LIVE_CHECK = 318767221,
     P_CL2FE_REQ_NANO_ACTIVE = 318767119,
-<<<<<<< Updated upstream
-=======
     P_CL2FE_REQ_NANO_EQUIP = 318767117,
     P_CL2FE_REQ_NANO_SKILL_USE = 318767121,
     P_CL2FE_REQ_NANO_TUNE = 318767120,
->>>>>>> Stashed changes
     P_CL2FE_REQ_PC_MOVE = 318767107,
     P_CL2FE_REQ_PC_STOP = 318767108,
     P_CL2FE_REQ_PC_JUMP = 318767109,
@@ -36,14 +33,11 @@ enum SHARDPACKETID {
 
     // shard 2 client
     P_FE2CL_REP_NANO_ACTIVE_SUCC = 822083624,
-<<<<<<< Updated upstream
-=======
     P_FE2CL_REP_PC_NANO_CREATE_SUCC = 822083667,
     P_FE2CL_REP_NANO_EQUIP_SUCC = 822083622,
     P_FE2CL_NANO_SKILL_USE_SUCC = 822083627,
     P_FE2CL_NANO_SKILL_USE = 822083628,
     P_FE2CL_REP_NANO_TUNE_SUCC = 822083625,
->>>>>>> Stashed changes
     P_FE2CL_REP_PC_ENTER_SUCC = 822083586,
     P_FE2CL_REP_PC_LOADING_COMPLETE_SUCC = 822083833,
     P_FE2CL_REP_PC_GOTO_SUCC = 822083633,