GitHub repository: r11621122/agron5106_merge_conflict
Description: Demo merge conflict