diff --git a/src/test.txt b/src/test.txt
index 8c002603..8c4e6119 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-solve conflict
+merge liuzx_trainjob