GitHub repository: rjmckenney/conflict
Description: Git exercise for conflicts