Dispute Resolution mechanism and conflict management