GitHub repository: rbevansp/conflict-resolution-example
Description: Question 4 of https://github.com/aezarebski/github-tutorial