Conflicts manager