bramvr/mac-agent-scripts/fix-merge-conflictsskill versions