From 6196266c16ae1befbeaa35ff6bf6225f26428fc1 Mon Sep 17 00:00:00 2001
From: mapcolonies-devops
 <143094402+mapcolonies-devops@users.noreply.github.com>
Date: Thu, 30 Apr 2026 13:25:27 +0300
Subject: [PATCH] chore(master): release 4.7.0

---
 .release-please-manifest.json |  2 +-
 CHANGELOG.md                  | 12 ++++++++++++
 helm/Chart.yaml               |  4 ++--
 package.json                  |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index fd087344..c0f9e2df 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "4.6.0"
+  ".": "4.7.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ad9fa9f..c5146430 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [4.7.0](https://github.com/MapColonies/catalog-app/compare/v4.6.0...v4.7.0) (2026-04-30)
+
+
+### Features
+
+* resolution conflict dialog ([#881](https://github.com/MapColonies/catalog-app/issues/881)) ([3f7ce8c](https://github.com/MapColonies/catalog-app/commit/3f7ce8cffda9011d4022c60492ad9c59fc196c66))
+
+
+### Bug Fixes
+
+* add ui curtain while fetching catalog data (MAPCO-6937) ([#879](https://github.com/MapColonies/catalog-app/issues/879)) ([5e14ed3](https://github.com/MapColonies/catalog-app/commit/5e14ed3600042d3e3023398a3d2bf3068fde5658))
+
 ## [4.6.0](https://github.com/MapColonies/catalog-app/compare/v4.5.1...v4.6.0) (2026-04-24)
 
 
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 558a8054..a818b22b 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 description: Helm chart to deploy Catalog App
 name: catalog-app
-version: 4.6.0
-appVersion: 4.6.0
+version: 4.7.0
+appVersion: 4.7.0
 dependencies:
   - name: helm-common
     version: 1.0.1
diff --git a/package.json b/package.json
index f1316e56..f52a98b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "catalog-app",
-  "version": "4.6.0",
+  "version": "4.7.0",
   "bugs": {
     "url": "https://github.com/MapColonies/catalog-app/issues"
   },