tgmarinho/agent-super-powers-matt-pocock-skills-comparasions/resolving-merge-conflictsskill versions