diff --git a/src/test.txt b/src/test.txt
index 611575df..22296beb 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-fix-473后端部分
+fix conflict