diff --cc file.txt
index ab87638,3f14491..0000000
--- file.txt
+++ file.txt
@@@ -1,3 -1,3 +1,9 @@@
  This is an example of git conflict markers.
  
++<<<<<<< HEAD
 +This line is changed on the main branch.
++||||||| c26bbf8
++This line is from the initial commit on the main branch.
++=======
+ This line is from the branch named "branch".
++>>>>>>> branch