From 549356cd76df49fc1d619b894d0bc47422cf0c0b Mon Sep 17 00:00:00 2001
From: Wuji <email@example.com>
Date: Sun, 24 Mar 2024 22:40:14 +0800
Subject: [PATCH 1/2] PR

---
 1.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/1.txt b/1.txt
index 850a74f..78d9c84 100644
--- a/1.txt
+++ b/1.txt
@@ -4,3 +4,4 @@ branc1
 =======
 111
 >>>>>>> 018c7cd44cba6d6b00221a17621febf027b46c75
+pull request
\ No newline at end of file

From ba530242af4483b4dc5ed137fedc3da1f54801ba Mon Sep 17 00:00:00 2001
From: Wuji <email@example.com>
Date: Sun, 24 Mar 2024 22:44:27 +0800
Subject: [PATCH 2/2] PR

---
 1.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/1.txt b/1.txt
index 78d9c84..8feabcb 100644
--- a/1.txt
+++ b/1.txt
@@ -1,7 +1,5 @@
 <<<<<<< HEAD
 111
-branc1
-=======
-111
->>>>>>> 018c7cd44cba6d6b00221a17621febf027b46c75
+branch1
+branch2
 pull request
\ No newline at end of file