Here is a simple readme file for the project.

Here's a typo that we want to fix. What will happen?

Here we fix the first typo, and make some other changes.

Here is an upstream change that will not conflict