Skills tagged merge: 1 agent skill for Claude Code

• fix-merge-conflicts — Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution