diff --git a/src/test.txt b/src/test.txt
index 387c75cd..a00af07a 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-front end
+merge