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