As discussed within the CoC committee

1 files changed, 13 insertions, 0 deletions

diff --git a/CodeOfConduct/Guidlines.mdwn b/CodeOfConduct/Guidlines.mdwn
index d65c028a..5b4c50a9 100644
--- a/CodeOfConduct/Guidlines.mdwn
+++ b/CodeOfConduct/Guidlines.mdwn
@@ -55,6 +55,13 @@ of the CoC team. When problematic behavior occurs, it's recommended to keep
 responses brief and to the point - and to reach out to the code of conduct
 team if moderating the discussion fails.
 
+Feel free to ask a more neutral person to deliver any messages in case there
+is a personal history between you and the persons involved or if you think
+it's better if the action can't be attributed to you directly. We also have the
+[@conduct](https://gitlab.freedesktop.org/conduct) gitlab account which can be
+used to comment on issues or merge requests on gitlab. Ping one of the current
+CoC team members if you want to make use of this account.
+
 ## Escalating issues within your project
 
 If a contributor is causing issues within your project, as a project maintainer you may choose to exclude them from your project's spaces. If the behavior is completely egregious, please immediately escalate to the Code of Conduct committee who can take appropriate action. In most cases, we suggest first issuing a firm warning to them about their behavior, with a ban to be placed if they do not heed this warning.
@@ -94,3 +101,9 @@ You may take this decision independently as a maintainer, however if you need an
 
     $yourname
     Maintainer, $project
+
+## Conflict of Interest
+
+In case you as a maintainer feel there is a risk of a conflict of
+Interests when taking actions against somebody, feel free to escalate it
+directly to the CoC team.