paulinevos/claude-stuff/resolve-merge-conflictskill versions