diff --git a/CHANGELOG b/CHANGELOG
index 96e455a22..6d8fe4926 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+mkdocs-material-9.6.1 (2025-01-31)
+
+  * Fixed #7943: Tags plugin crashing due to merge error
+
 mkdocs-material-9.6.0 (2025-01-31)
 
   * Added meta plugin
diff --git a/docs/changelog/index.md b/docs/changelog/index.md
index 221d62da4..5f64d53a8 100644
--- a/docs/changelog/index.md
+++ b/docs/changelog/index.md
@@ -2,6 +2,10 @@
 
 ## Material for MkDocs
 
+### 9.6.1 <small>January 31, 2025</small> { id="9.6.1" }
+
+- Fixed #7943: Tags plugin crashing due to merge error
+
 ### 9.6.0 <small>January 31, 2025</small> { id="9.6.0" }
 
 - Added meta plugin
diff --git a/material/__init__.py b/material/__init__.py
index 8a19d9e6b..207b60e53 100644
--- a/material/__init__.py
+++ b/material/__init__.py
@@ -18,4 +18,4 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-__version__ = "9.6.0"
+__version__ = "9.6.1"
diff --git a/material/templates/base.html b/material/templates/base.html
index 7921c751e..0c5d40ab4 100644
--- a/material/templates/base.html
+++ b/material/templates/base.html
@@ -32,7 +32,7 @@
         <link rel="alternate" type="application/rss+xml" title="{{ lang.t('rss.updated') }}" href="{{ 'feed_rss_updated.xml' | url }}">
       {% endif %}
       <link rel="icon" href="{{ config.theme.favicon | url }}">
-      <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-9.6.0">
+      <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-9.6.1">
     {% endblock %}
     {% block htmltitle %}
       {% if page.meta and page.meta.title %}
diff --git a/package-lock.json b/package-lock.json
index 6b92f435c..2b0b5ed2f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mkdocs-material",
-  "version": "9.6.0",
+  "version": "9.6.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mkdocs-material",
-      "version": "9.6.0",
+      "version": "9.6.1",
       "license": "MIT",
       "dependencies": {
         "clipboard": "^2.0.11",
diff --git a/package.json b/package.json
index df1aac471..458c0cf9c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mkdocs-material",
-  "version": "9.6.0",
+  "version": "9.6.1",
   "description": "Documentation that simply works",
   "keywords": [
     "mkdocs",