diff --git a/.env.dev b/.env.dev
index b81a776a..4a2eacf2 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,18 +1,12 @@
 
-<<<<<<< HEAD
+
 SUPERUSERS=[""]
-=======
-SUPERUSERS=["775757368"]
->>>>>>> master
+
 COMMAND_START=[""]
 
 SESSION_RUNNING_EXPRESSION="别急呀,小真寻要宕机了!QAQ"
 
-<<<<<<< HEAD
 NICKNAME=["真寻", "小真寻", "绪山真寻", "小寻子"]
-=======
-NICKNAME=["A"]
->>>>>>> master
 
 SESSION_EXPIRE_TIMEOUT=30