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