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

Merge conflicts are a very common part of working with GitHub. Do not fear the conflicts, friends!

Here is some more content that we added through Github.