I'm going to create the conflict with this one.
I merged in and overwrote the README file with my changes.