GitHub repository: nandi-molly/conflict-resolution-example
Primary language: R
Description: Question 4 of https://github.com/aezarebski/github-tutorial