diff --git a/a.txt b/a.txt
index d7b00b8..e69de29 100644
--- a/a.txt
+++ b/a.txt
@@ -1,6 +0,0 @@
-aaaa
-<<<<<<< HEAD
-br2
-=======
-br1
->>>>>>> br1