Introduction to GitHub Desktop, Part 3 (Merge Conflicts)