districts and schools added
conflicts resolved