GitHub repository: woz-u/merge-conflict-example
Description: Example repo for learning how to resolve merge conflicts