diff --git a/README.md b/README.md index 002e7ac292d23e0638e9f3418b17b9400d3dedd8..3edcc1f7e2d7f86560b890918fd295123695c304 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,14 @@ new branch1 2 3 +<<<<<<< HEAD new branch5 1 - 2 - 3 +======= +new branch4 +3 +- 4 +- 5 +>>>>>>> d36f80cda29c32f1cd9a7fdbdfb5e973ac414d99