From 7039525d007642a0b34d36bc25e1f6f4d4709a08 Mon Sep 17 00:00:00 2001
From: Quintin Coetzee <quintin.coetzee@openenergytransition.org>
Date: Tue, 13 Oct 2026 12:06:00 +0200
Subject: [PATCH] Update ConflictResolutionPolicy.mdx

Caps & maintainers
---
 docs/Policies/ConflictResolutionPolicy.mdx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/Policies/ConflictResolutionPolicy.mdx b/docs/Policies/ConflictResolutionPolicy.mdx
index 8337acb..afe2ac3 100644
--- a/docs/Policies/ConflictResolutionPolicy.mdx
+++ b/docs/Policies/ConflictResolutionPolicy.mdx
@@ -5,9 +5,9 @@ sidebar_label: "Conflict resolution policy"
 import MaintainerTag from "@site/src/components/MaintainerTag";
 import ControlledDocBanner from "@site/src/components/ControlledDocBanner";
 
-<MaintainerTag maintainerEmails={["quintin.coetzee@openenergytransition.org", "max.parzen@openenergytransition.org"]} />
+<MaintainerTag maintainerEmails={["quintin.coetzee@openenergytransition.org", "jodie.barnard@openenergytransition.org"]} />
 
-# Conflict resolution policy
+# Conflict Resolution Policy
 
 <ControlledDocBanner />