diff --git a/a.txt b/a.txt
index 660b7ee..d7b00b8 100644
--- a/a.txt
+++ b/a.txt
@@ -1,2 +1,6 @@
 aaaa
-br2
\ No newline at end of file
+<<<<<<< HEAD
+br2
+=======
+br1
+>>>>>>> br1