Advanced conflict management