diff --git a/README.md b/README.md index 2178b72..b520db2 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,6 @@ +<<<<<<< HEAD +branch1 +======= branch2 +>>>>>>> main