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