diff --git a/dev.txt b/dev.txt
index 02b6c950bb3b341d4548cec097284108bb20f71e..9e6bcc0c2f6db538b7898737cb824b41dc4f5b0b 100644
--- a/dev.txt
+++ b/dev.txt
@@ -1,2 +1,3 @@
 Ma première ligne
 Titi
+new line after merge with conflit