1 skills ranked by installs
Resolve Conflicts
Plan-first Git merge conflict resolution keeps both changes and validates with tests