diff --git a/README.md b/README.md
index 2286b58..f13d004 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,16 @@ Richard Visited
 
 feature10 OhNo
 
-feature to hotfix-YPJ
-
 kkk
 
+<<<<<<< HEAD
+
+YJ-rebase
+
 
 sd
-s
\ No newline at end of file
+s
+
+=======
+YJ-rebase-push
+>>>>>>> e7f4e29 (edit README.md again)