more security config
details about 2i tagging and conflict resolution