diff --git a/README.md b/README.md index d9d5a6b..29c9ea9 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,4 @@ testing testing Another line Yet another +This is a real conflict