GitHub repository: sverrep/merge-conflict-py
Description: Merge conflict example for Git workshop