diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml
index fd62d3c..84be091 100644
--- a/.mokogitea/manifest.xml
+++ b/.mokogitea/manifest.xml
@@ -9,7 +9,7 @@
Template - MokoOnyx
MokoConsulting
MokoOnyx - Joomla site template (successor to MokoCassiopeia)
- 02.15.00
+ 02.15.01
GNU General Public License v3
diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml
index d2ff949..5ef4727 100644
--- a/.mokogitea/workflows/issue-branch.yml
+++ b/.mokogitea/workflows/issue-branch.yml
@@ -6,10 +6,16 @@
# DEFGROUP: Gitea.Workflow
# INGROUP: moko-platform.Automation
<<<<<<< HEAD
+<<<<<<< HEAD
+# VERSION: 02.15.01
+=======
+# VERSION: 02.15.01
+=======
# VERSION: 02.15.00
=======
# VERSION: 02.15.00
>>>>>>> origin/main
+>>>>>>> origin/main
# BRIEF: Auto-create feature branch when an issue is opened
name: "Universal: Issue Branch"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e822695..74fbc10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,26 @@
INGROUP: MokoOnyx.Documentation
PATH: ./CHANGELOG.md
<<<<<<< HEAD
+<<<<<<< HEAD
+ VERSION: 02.15.01
+ BRIEF: Changelog file documenting version history of MokoOnyx
+ -->
+
+# Changelog — MokoOnyx (VERSION: 02.15.01)
+=======
+ VERSION: 02.15.01
+ BRIEF: Changelog file documenting version history of MokoOnyx
+ -->
+
+# Changelog — MokoOnyx (VERSION: 02.15.01)
+>>>>>>> origin/main
+=======
VERSION: 02.15.00
BRIEF: Changelog file documenting version history of MokoOnyx
-->
# Changelog — MokoOnyx (VERSION: 02.15.00)
+>>>>>>> origin/main
## [Unreleased]
## [02.15.00] --- 2026-05-30
diff --git a/SECURITY.md b/SECURITY.md
index 1d5e820..513330e 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -11,9 +11,15 @@
REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
FILE: SECURITY.md
<<<<<<< HEAD
+<<<<<<< HEAD
+ VERSION: 02.15.01
+=======
+ VERSION: 02.15.01
+=======
VERSION: 02.15.00
=======
VERSION: 02.15.00
+>>>>>>> origin/main
>>>>>>> origin/main
BRIEF: Security policy and vulnerability reporting process for MokoOnyx.
PATH: /SECURITY.md
diff --git a/src/html/com_joomgallery/category/default.php b/src/html/com_joomgallery/category/default.php
index e4e67e4..0899e99 100644
--- a/src/html/com_joomgallery/category/default.php
+++ b/src/html/com_joomgallery/category/default.php
@@ -12,9 +12,15 @@
* REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
* PATH: /html/com_joomgallery/category/default.php
<<<<<<< HEAD
+<<<<<<< HEAD
+ * VERSION: 02.15.01
+=======
+ * VERSION: 02.15.01
+=======
* VERSION: 02.15.00
=======
* VERSION: 02.15.00
+>>>>>>> origin/main
>>>>>>> origin/main
* BRIEF: Category view override — password gate then loads default_cat sub-layout
*/
diff --git a/src/html/com_joomgallery/category/default_cat.php b/src/html/com_joomgallery/category/default_cat.php
index 77c073b..55c5ef9 100644
--- a/src/html/com_joomgallery/category/default_cat.php
+++ b/src/html/com_joomgallery/category/default_cat.php
@@ -12,9 +12,15 @@
* REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
* PATH: /html/com_joomgallery/category/default_cat.php
<<<<<<< HEAD
+<<<<<<< HEAD
+ * VERSION: 02.15.01
+=======
+ * VERSION: 02.15.01
+=======
* VERSION: 02.15.00
=======
* VERSION: 02.15.00
+>>>>>>> origin/main
>>>>>>> origin/main
* BRIEF: Category sub-layout — subcategories grid + images grid with pagination
*/
diff --git a/src/html/com_joomgallery/gallery/default.php b/src/html/com_joomgallery/gallery/default.php
index cba3bb4..a28f316 100644
--- a/src/html/com_joomgallery/gallery/default.php
+++ b/src/html/com_joomgallery/gallery/default.php
@@ -12,9 +12,15 @@
* REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
* PATH: /html/com_joomgallery/gallery/default.php
<<<<<<< HEAD
+<<<<<<< HEAD
+ * VERSION: 02.15.01
+=======
+ * VERSION: 02.15.01
+=======
* VERSION: 02.15.00
=======
* VERSION: 02.15.00
+>>>>>>> origin/main
>>>>>>> origin/main
* BRIEF: Gallery view override — main image grid with masonry/justified layout
*/
diff --git a/src/html/com_joomgallery/image/default.php b/src/html/com_joomgallery/image/default.php
index 3d537df..f59dbd6 100644
--- a/src/html/com_joomgallery/image/default.php
+++ b/src/html/com_joomgallery/image/default.php
@@ -12,9 +12,15 @@
* REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
* PATH: /html/com_joomgallery/image/default.php
<<<<<<< HEAD
+<<<<<<< HEAD
+ * VERSION: 02.15.01
+=======
+ * VERSION: 02.15.01
+=======
* VERSION: 02.15.00
=======
* VERSION: 02.15.00
+>>>>>>> origin/main
>>>>>>> origin/main
* BRIEF: Image detail view override — single image with metadata, tags, custom fields
*/
diff --git a/src/html/layouts/joomla/module/card.php b/src/html/layouts/joomla/module/card.php
index 80c1e29..d440d18 100644
--- a/src/html/layouts/joomla/module/card.php
+++ b/src/html/layouts/joomla/module/card.php
@@ -11,9 +11,15 @@
* REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
* PATH: /html/layouts/joomla/module/card.php
<<<<<<< HEAD
+<<<<<<< HEAD
+ * VERSION: 02.15.01
+=======
+ * VERSION: 02.15.01
+=======
* VERSION: 02.15.00
=======
* VERSION: 02.15.00
+>>>>>>> origin/main
>>>>>>> origin/main
* BRIEF: Custom card module chrome — renders module titles for all modules
*/
diff --git a/src/html/layouts/mokoonyx/article-metadata.php b/src/html/layouts/mokoonyx/article-metadata.php
index c37197a..b468d2c 100644
--- a/src/html/layouts/mokoonyx/article-metadata.php
+++ b/src/html/layouts/mokoonyx/article-metadata.php
@@ -12,9 +12,15 @@
* REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
* PATH: /src/html/layouts/mokoonyx/article-metadata.php
<<<<<<< HEAD
+<<<<<<< HEAD
+ * VERSION: 02.15.01
+=======
+ * VERSION: 02.15.01
+=======
* VERSION: 02.15.00
=======
* VERSION: 02.15.00
+>>>>>>> origin/main
>>>>>>> origin/main
* BRIEF: Article metadata footer layout -- renders jcfields grouped by field group
*/
diff --git a/src/media/css/a11y-high-contrast.css b/src/media/css/a11y-high-contrast.css
index c5f68c9..7a6ba9f 100644
--- a/src/media/css/a11y-high-contrast.css
+++ b/src/media/css/a11y-high-contrast.css
@@ -11,9 +11,15 @@
* REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
* PATH: ./media/css/a11y-high-contrast.css
<<<<<<< HEAD
+<<<<<<< HEAD
+ * VERSION: 02.15.01
+=======
+ * VERSION: 02.15.01
+=======
* VERSION: 02.15.00
=======
* VERSION: 02.15.00
+>>>>>>> origin/main
>>>>>>> origin/main
* BRIEF: High-contrast stylesheet for accessibility toolbar
*/
diff --git a/src/media/css/template.css b/src/media/css/template.css
index f019374..99c4e83 100644
--- a/src/media/css/template.css
+++ b/src/media/css/template.css
@@ -23528,3 +23528,4 @@ font-size: 0.8125rem;
.fa-brands {
margin-right: 0.25rem;
}
+/* patch release test */
diff --git a/src/templateDetails.xml b/src/templateDetails.xml
index 0c23d40..b17a1fb 100644
--- a/src/templateDetails.xml
+++ b/src/templateDetails.xml
@@ -36,7 +36,11 @@
mokoonyx
+<<<<<<< HEAD
+ 02.15.01-dev
+=======
02.15.00
+>>>>>>> origin/main
script.php
2026-05-16
Jonathan Miller || Moko Consulting