Add info about small change
Add that we're making really small change
Demonstrate merge conflict
Add info about merge conflicts