GitHub repository: smilesandtea/merge-conflicts
Description: App Academy project testing merge conflicts