GitHub repository: KeithCrofton/git-conflicts
Description: Practice repository for fixing conflicts