GitHub repository: BruceBell1271/github-practice
Created: 2020-06-23T21:36:45Z
Description: use github commands to get merge conflicts and resolve them