Working towards disputes and conflict resolution