Lesson 7 of Track 7 (Git Workflow: From Solo to Multi-Agent Teams). Merge conflicts are mechanical, not catastrophic. You learn why they happen, how to read git's conflict markers, the step-by-step resolution process, the five conflict types (textual, logical, semantic, delete-modify, rename-edit), and when to abort and retry. By the end you can resolve any conflict you'll encounter in two-person collaboration.