diff --git a/a.txt b/a.txt
index e69de29..9807a19 100644
--- a/a.txt
+++ b/a.txt
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+=======
+aaaa
+br2
+>>>>>>> br2