diff --git a/src/test.txt b/src/test.txt
index 31d68750..22296beb 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-fix issue 472
+fix conflict