diff --git a/src/test.txt b/src/test.txt
index 36f900ab..48816493 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-add err des
+fix merge conflict