Merge conflicts, you don't fear them. They happen all the time.

This is additional content that was added through the GitHub interface! I am causing a merge conflict.

This is a repo that is used, in class, to demonstrate how to solve a merge conflict when it occurs with your teammates. Sometimes Github will automatically solve the issue, other times it cannot and requires human intervention.

Merge Conflicts - edit made on github.com

Merge conflicts are a common part of working with GitHub. Do not fear the conflicts, my friends! We will solve the issues!