diff --git a/README b/README index 8f217b9..26a5128 100644 --- a/README +++ b/README @@ -3,3 +3,4 @@ hi ======= foo bar >>>>>>> 9f77888d7a594699894a17f4d61fc9dfac3cfb74 + HELLO FRIEND