diff --git a/dev.txt b/dev.txt
index 6125af0..71a4030 100644
--- a/dev.txt
+++ b/dev.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 dev分支
+=======
+dev分
+>>>>>>> dev