GitHub repository: nagisa0077/agron5106_merge_conflict
Description: Demo merge conflict