GitHub repository: CS121TestOrg/merging-pulling-exercise
Created: 2018-04-15T00:32:38Z
Description: Merge conflict, pull request, and how to resolve the conflict