12-merge-conflicts Merge-conflict resolution demos from Week Twelve Sign Below Use a bullet and include your GitHub username, e.g, * The Octo Cat (@octocat)