More

    conflict management