chore(ifpc): rebasing branch with more changes

Author: aramos-adobe

components/buttongroup/package.json

@@ -1,10 +1,6 @@
 {
 	"name": "@spectrum-css/buttongroup",
-<<<<<<< HEAD
 	"version": "7.0.0-next.4",
-=======
-	"version": "7.0.0-next.2",
->>>>>>> f91706df0 (chore(release): release)
 	"description": "The Spectrum CSS buttongroup component",
 	"license": "Apache-2.0",
 	"author": "Adobe",