fix-merge-conflicts: Claude Code and agent skill by scino/fstack | Verified Skill