fix-merge-conflicts: Claude Code and agent skill by jaydubya818/skillz | Verified Skill