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