diff --git a/README.md b/README.md index 7116256d983edfed6b86954e00a1edc5f4bbc9cc..ceee45b467ff745292288d3d5650c9bc474ee753 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ test-project - I edited in web ### I am in the branch 0510 *** * Hello +MAIN MAIN MAIN <<<<<<< HEAD * edit in 0510