GitHub repository: tusongyang/agron5106_merge_conflict
Description: Demo merge conflict