GitHub repository: ngantzler/demo_merge_conflict
Created: 2023-10-07T22:54:17Z
Description: For demonstration, show how merge conflicts arise and are resolved