Change Dispute Resolution and add Code of conduct