diff --git a/conflict.txt b/conflict.txt
index e97bf0c..6dc1032 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,3 +1,4 @@
 This is line 1
-This is line 2
+This is line 2 — edited in f2
+
 This is line 3