merge-resolver

Resolve git merge conflicts intelligently using AI. Use when the user has merge conflicts they need help resolving.