third-branch Practice repository to go along with the a/A lesson: "Creating and Resolving Merge Conflicts Practice"