GitHub repository: B08601030/agron5106_merge_conflict
Description: Demo merge conflict