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