Squashed commit of the following:

commit 568fe70041 Author: WYS <573869201@qq.com> Date: Thu Aug 8 11:34:55 2024 +0800 br2 # Conflicts: # a.txt
br1
1 changed files with 1 additions and 4 deletions
--- a/a.txt
+++ b/a.txt
@ -1,5 +1,2 @@
-<<<<<<< HEAD
-=======
 aaaa
 br2
->>>>>>> br2
Author	SHA1	Message	Date
WYS	a23051ddb0	Squashed commit of the following: commit `568fe70041` Author: WYS <573869201@qq.com> Date: Thu Aug 8 11:34:55 2024 +0800 br2 # Conflicts: # a.txt	6 months ago
WYS	7803204d87	br1	6 months ago