Three-way merge: paste the base version, their changes, and your changes. Conflicts are highlighted for manual resolution.