diff --git a/README.md b/README.md index a5d4a226ee..e1ddea7a14 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +<<<< HEAD +