GitHub repository: Ashworth836/merge-conflicts-practice
Created: 2022-08-30T23:39:28Z
Description: you will be creating merge conflicts and then resolving them in both GitHub on your browser, and via the command line