diff --git a/README.md b/README.md
index 20353c9..5060abc 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,5 @@
 softeng
-<<<<<<< HEAD
-==============
 
-=======
 ===============
 -add new item
 -add new item 2
->>>>>>> 70807be619b9fffad1139849dba18da3f99f3ff7