Update src/DistrictPlanner.java

Test merge conflicts