added support for detecting potential policy conflicts, there can be only one master