featherhunter/dsh-mattpocock-skills-deck/resolving-merge-conflictsskill versions