Merge conflict resolver

Practice reading conflict markers, choosing ours/theirs/manual, and finishing with a clean file — the skill behind git merge pain.