diff --git a/README.md b/README.md
index f519dfa7ba1edeb980e71d059fe07d7d4ce607ff..072cbf354ebb4c0820379680c6b896e2fb79d8c0 100644
--- a/README.md
+++ b/README.md
@@ -17,4 +17,8 @@ test-project - I edited in web
 ### I am in the branch 0510
 
 * Hello
+<<<<<<< HEAD
 * edit in 0510
+=======
+* edit from main
+>>>>>>> main