diff --git a/src/test.txt b/src/test.txt
index da5cf097..22296beb 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-add dir
+fix conflict