diff --git a/src/test.txt b/src/test.txt
index 22296beb..143d88ff 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-fix conflict
+Merge pull request 'fix for 47' (#48) from fix-47 into develop