From c42b94142145b6699b426500cef4d0e510284983 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Mon, 29 Jul 2024 18:27:13 +0000
Subject: [PATCH] ci(release): 8.15.0-beta.17 [skip ci]

---
 docs/CHANGELOG.md | 6 ++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index bff9eadd74..fe4a2168ab 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,3 +1,9 @@
+# [8.15.0-beta.17](https://github.com/Teradata/covalent/compare/v8.15.0-beta.16...v8.15.0-beta.17) (2024-07-29)
+
+### Bug Fixes
+
+- **components:** revert merge conflicts ([5208f9d](https://github.com/Teradata/covalent/commit/5208f9d65775b56b0c3855052bdddca16f7eb1b8))
+
 # [8.15.0-beta.15](https://github.com/Teradata/covalent/compare/v8.15.0-beta.14...v8.15.0-beta.15) (2024-07-28)
 
 ### Bug Fixes
diff --git a/package-lock.json b/package-lock.json
index 8031a42bea..758cde7358 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "covalent",
-  "version": "8.15.0-beta.15",
+  "version": "8.15.0-beta.17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "covalent",
-      "version": "8.15.0-beta.15",
+      "version": "8.15.0-beta.17",
       "hasInstallScript": true,
       "dependencies": {
         "@angular/animations": "17.x.x",
diff --git a/package.json b/package.json
index 31d55e28fb..e445a6a9e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "covalent",
-  "version": "8.15.0-beta.15",
+  "version": "8.15.0-beta.17",
   "description": "Teradata UI Platform built on Angular Material",
   "keywords": [
     "angular",