Merge conflICts, DO nOt fear them!!!!???/?/

ThIIs is content that was DEFintely added through the GitHub interffFFfface. I am causing a merge conflict?.

Thid sentefnce was addefd locally.

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