diff --git a/src/test.txt b/src/test.txt
index 7529ded8..d15a4358 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-debug display
+sovel mergin conflict