District Assemblies directed to resolve conflicts