Managing Conflicts