An example of how merge conflicts happen, and how to resolve them