GitHub repository: CelAdel/assessment_q4_conflict-resolution
Description: Question 4 of https://github.com/aezarebski/github-tutorial