Independent Senate districts now Persian Green color
resolve small branch merge conflicts