diff --git a/sample.txt b/sample.txt
index 1ba528d..b67ef80 100644
--- a/sample.txt
+++ b/sample.txt
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 30
 2
 6 10
 18 20
+=======
+组员：王崇宇、孙永霖、李东阳
+>>>>>>> 64c0909da2ce9acc81ff108d1cb4199dc8b159a6