diff --git a/src/test.txt b/src/test.txt
index b5ace3a7..c6c7fd77 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-fix for 47
+fix merge