Collaborative conflict management