From 4d82499b25eaa7f8e2ed52264ceef0dbdbc22c82 Mon Sep 17 00:00:00 2001
From: Oscar Gomez <42280574+oscarg933@users.noreply.github.com>
Date: Sun, 25 Nov 2018 11:50:56 -0700
Subject: [PATCH] Update README.md

---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ac138229..adc95f69 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,14 @@ The components installed are:
 * Spam filtering ([spamassassin](https://spamassassin.apache.org/)), greylisting ([postgrey](http://postgrey.schweikert.ch/))
 * DNS ([nsd4](https://www.nlnetlabs.nl/projects/nsd/)) with [SPF](https://en.wikipedia.org/wiki/Sender_Policy_Framework), DKIM ([OpenDKIM](http://www.opendkim.org/)), [DMARC](https://en.wikipedia.org/wiki/DMARC), [DNSSEC](https://en.wikipedia.org/wiki/DNSSEC), [DANE TLSA](https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities), and [SSHFP](https://tools.ietf.org/html/rfc4255) records automatically set
 * Backups ([duplicity](http://duplicity.nongnu.org/)), firewall ([ufw](https://launchpad.net/ufw)), intrusion protection ([fail2ban](http://www.fail2ban.org/wiki/index.php/Main_Page)), system monitoring ([munin](http://munin-monitoring.org/))
-
+* This branch has conflicts that must be resolved
+Only those with write access to this repository can merge pull requests.
+Conflicting files
+management/auth.py
+management/daemon.py
+management/mailconfig.py
+setup/mail-users.sh
+setup/management.sh
 It also includes:
 
 * A control panel and API for adding/removing mail users, aliases, custom DNS records, etc. and detailed system monitoring.