GitHub repository: larmitage-bjss/skills-resolve-merge-conflicts
Description: Github Exercise - Manage merge conflicts