diff --git a/4.txt b/4.txt
index 1c4ebda..9e0deb0 100644
--- a/4.txt
+++ b/4.txt
@@ -1 +1,5 @@
-224444
\ No newline at end of file
+<<<<<<< HEAD
+224444
+=======
+4444
+>>>>>>> 添加内容：4444
diff --git a/patch.diff b/patch.diff
index 00adbe0..94cf9e4 100644
--- a/patch.diff
+++ b/patch.diff
@@ -1,7 +1,7 @@
-From 9f23f8d55080aefe72907da63f43496304efbb6e Mon Sep 17 00:00:00 2001
+From 1ada2bb4747c94d72dbb350104092b46b9c5c83a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E2=80=9Cxinle=E2=80=9D?= <112196496@qq.com>
-Date: Wed, 23 Feb 2022 15:13:04 +0800
-Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B94444=20#=094.txt?=
+Date: Wed, 23 Feb 2022 15:22:58 +0800
+Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=86=85=E5=AE=B9=EF=BC=9A22?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -11,13 +11,13 @@ Content-Transfer-Encoding: 8bit
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/4.txt b/4.txt
-index 591bf73..1b82438 100644
+index 1b82438..1c4ebda 100644
 --- a/4.txt
 +++ b/4.txt
 @@ -1 +1 @@
--5555
+-4444
 \ No newline at end of file
-+4444
++224444
 \ No newline at end of file
 -- 
 2.33.1.windows.1