fix: resolve conflicts

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [9.14.21](https://github.com/Kong/kongponents/compare/v9.14.20...v9.14.21) (2024-12-10)
+
+
+### Bug Fixes
+
+* **link:** apply styles to deep ([84a4e9f](https://github.com/Kong/kongponents/commit/84a4e9f75c7bff9b136ae3e89d7cc2be51dbcc3f))
+
+## [9.14.20](https://github.com/Kong/kongponents/compare/v9.14.19...v9.14.20) (2024-12-06)
+
+
+### Bug Fixes
+
+* **kradio:** remove horizontal card vertical spacing ([#2526](https://github.com/Kong/kongponents/issues/2526)) ([d4dc2b7](https://github.com/Kong/kongponents/commit/d4dc2b772dad039a95a67f6fce6f3909d1e49ca4))
+
 ## [9.14.19](https://github.com/Kong/kongponents/compare/v9.14.18...v9.14.19) (2024-12-03)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kong/kongponents",
-  "version": "9.14.19",
+  "version": "9.14.21",
   "description": "Kong Component library",
   "type": "module",
   "repository": {
@@ -89,7 +89,7 @@
     "@types/sortablejs": "^1.15.8",
     "@vitejs/plugin-vue": "^5.1.4",
     "@vue/compiler-core": "^3.5.12",
-    "@vue/tsconfig": "^0.6.0",
+    "@vue/tsconfig": "^0.7.0",
     "@vueuse/core": "^11.1.0",
     "autoprefixer": "^10.4.20",
     "axios": "^1.7.7",
@@ -100,7 +100,7 @@
     "cypress": "^13.15.1",
     "cypress-fail-fast": "^7.1.1",
     "cz-conventional-changelog": "3.3.0",
-    "eslint": "^9.15.0",
+    "eslint": "^9.16.0",
     "inquirer": "^9.3.6",
     "nanospinner": "^1.1.0",
     "node-emoji": "^2.1.3",