diff --git a/main-merge-ex.txt b/main-merge-ex.txt
index a5e32a8..edf5486 100644
--- a/main-merge-ex.txt
+++ b/main-merge-ex.txt
@@ -2,5 +2,5 @@ Hello from main branch
 Hello from conflict branch
 
 
-
-Hello from main branch
\ No newline at end of file
+Hello from main branch
+Hello from conflict-a branch