resolving-merge-conflicts: Claude Code and agent skill by aethrox/doctrine | Verified Skill