Conflict Resolution Skill

Conflict resolution covers identifying merge conflicts, editing conflict markers, staging resolutions, and completing interrupted operations.