stibnite: building dfbj1i0dv1mrz30fkklykpdvywb75avw-claude-code-skill-resolving-merge-conflicts.drv