diff --git a/4.txt b/4.txt
index 9e0deb0..1b82438 100644
--- a/4.txt
+++ b/4.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-224444
-=======
-4444
->>>>>>> 添加内容：4444
+4444
\ No newline at end of file