GitHub repository: Gboom345/gitme
Description: Repo to demonstrate merge conflict resolution