1 changed files with 4 additions and 1 deletions
--- a/a.txt
+++ b/a.txt
@ -1,2 +1,5 @@
+<<<<<<< HEAD
+=======
 aaaa
-br2
+br2
+>>>>>>> br2