version bumps, new version of new deployment skeleton
merge
new skel
merge resolution