diff --git a/README b/README index 8f217b9..1df59cb 100644 --- a/README +++ b/README @@ -1,5 +1,6 @@ <<<<<<< HEAD hi +bye ======= foo bar >>>>>>> 9f77888d7a594699894a17f4d61fc9dfac3cfb74