diff --git a/teammates b/teammates
index 5886794..b8b24f6 100644
--- a/teammates
+++ b/teammates
@@ -1,10 +1,7 @@
 杨腾泽
 孙英皓
 刘彩月
-<<<<<<< HEAD
 李聪颖1
-=======
 李聪颖
 hello world
 goodbye
->>>>>>> a879cff355118113df8336ccf49727504b5d553a